Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/process.c between commit 8a27ef90237f ("x86 idle: fix
build warning for WARN_ONCE("idle=mwait")") from the idle-test tree and
commit 598e887d8b01 ("x86 idle: Fix mwait deprecation warning message")
from the tip tree.
Slightly different patches for the same warning. I fixed it up (using
the version from the idle-test tree which is more complete).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpJc3DIDjZkG.pgp
Description: PGP signature
