Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
arch/powerpc/include/asm/cputhreads.h
between commit:
b350111bf7b3 ("powerpc: remove cpu_online_cores_map function")
from the powerpc tree and commit:
4e258d05437b ("cpumask: replace cpumask_next_* with cpumask_first_* where appropriate")
from the bitmap tree.
I fixed it up (the former removed the code updated by the latter, so I
just used that) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
Attachment:
pgpnVbWjuXufI.pgp
Description: OpenPGP digital signature
