linux-kernel - linux-next: manual merge of the tip tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20110531101934.2737dc90.sfr@canb.auug.org.au>
Date:	Tue, 31 May 2011 10:19:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Len Brown <len.brown@...el.com>, Borislav Petkov <bp@...en8.de>
Subject: linux-next: manual merge of the tip tree with the  tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped