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