Messages in this thread | | | Date | Fri, 31 Dec 2010 13:55:23 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the percpu tree with the tip tree |
| |
Hi all,
Today's linux-next merge of the percpu tree got a conflict in arch/x86/kernel/apic/nmi.c between commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a ("x86, nmi_watchdog: Remove the old nmi_watchdog") from the tip tree and a couple of commits from the percpu tree.
The former commit removes the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |