Messages in this thread | | | Date | Tue, 27 Sep 2011 15:14:54 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rcu tree with Linus' tree |
| |
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in arch/x86/kernel/cpu/mcheck/mce.c between commit b77e70bf3535 ("x86, mce: Replace MCE_SELF_VECTOR by irq_work") from Linus' tree and commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from the rcu tree.
The commit in Linus' tree seem to superced the need for the rcu tree patch ... so I effectively dropped the rcu tree change to this file. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |