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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpH6dyfmVoB3.pgp
Description: PGP signature
