* linux-next: manual merge of the bitmap tree with the powerpc tree
@ 2021-12-08 5:31 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-12-08 5:31 UTC (permalink / raw)
To: Yury Norov, Michael Ellerman, PowerPC
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Nicholas Piggin
[-- Attachment #1: Type: text/plain, Size: 836 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-08 5:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-08 5:31 linux-next: manual merge of the bitmap tree with the powerpc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).