* linux-next: manual merge of the tip tree with tLinus' tree
@ 2011-12-19 4:49 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-12-19 4:49 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Suresh Siddha
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-19 4:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-19 4:49 linux-next: manual merge of the tip tree with tLinus' tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.