linux-kernel - linux-next: manual merge of the tip tree with tLinus' 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: <20111219154938.0375549c381b3d7bce466b50@canb.auug.org.au>
Date:	Mon, 19 Dec 2011 15:49:38 +1100
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,
	Suresh Siddha <suresh.b.siddha@...el.com>
Subject: linux-next: manual merge of the tip tree with tLinus' tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
kernel/sched/fair.c between commit ab2789213d22 ("sched: Fix
select_idle_sibling() regression in selecting an idle SMT sibling") from
Linus' tree (where this is kernel/sched_fair.c) and commit 77e81365e0b7
("sched: Clean up domain traversal in select_idle_sibling()") from the
tip tree.

OK, I am not sure what to do about this, so I just used the tip tree
version.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped