* linux-next: manual merge of the memblock tree with the pidfd tree
@ 2020-07-06 5:58 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-07-06 5:58 UTC (permalink / raw)
To: Mike Rapoport, Christian Brauner
Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
Hi all,
Today's linux-next merge of the memblock tree got a conflict in:
arch/unicore32/kernel/process.c
between commit:
8496da092a53 ("unicore: switch to copy_thread_tls()")
714acdbd1c94 ("arch: rename copy_thread_tls() back to copy_thread()")
from the pidfd tree and commit:
fb37409a01b0 ("arch: remove unicore32 port")
from the memblock tree.
I fixed it up (I just removed the file) 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:[~2020-07-06 5:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-06 5:58 linux-next: manual merge of the memblock tree with the pidfd 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