* linux-next: manual merge of the pidfd tree with the sh tree
@ 2020-07-22 10:38 Stephen Rothwell
2020-08-05 0:40 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-07-22 10:38 UTC (permalink / raw)
To: Christian Brauner, Rich Felker
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
arch/um/Kconfig
between commit:
5c77ba8aa183 ("dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig")
from the sh tree and commit:
140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")
from the pidfd tree.
I fixed it up (see below) 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
diff --cc arch/um/Kconfig
index 32c1d1945033,ef69be17ff70..000000000000
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -14,8 -14,6 +14,7 @@@ config UM
select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_DEBUG_KMEMLEAK
select HAVE_DEBUG_BUGVERBOSE
- select HAVE_COPY_THREAD_TLS
+ select NO_DMA
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
select GENERIC_CLOCKEVENTS
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the pidfd tree with the sh tree
2020-07-22 10:38 linux-next: manual merge of the pidfd tree with the sh tree Stephen Rothwell
@ 2020-08-05 0:40 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-08-05 0:40 UTC (permalink / raw)
To: Christian Brauner, Rich Felker
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 1347 bytes --]
Hi all,
On Wed, 22 Jul 2020 20:38:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> arch/um/Kconfig
>
> between commit:
>
> 5c77ba8aa183 ("dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig")
>
> from the sh tree and commit:
>
> 140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")
>
> from the pidfd tree.
>
> I fixed it up (see below) 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.
>
> diff --cc arch/um/Kconfig
> index 32c1d1945033,ef69be17ff70..000000000000
> --- a/arch/um/Kconfig
> +++ b/arch/um/Kconfig
> @@@ -14,8 -14,6 +14,7 @@@ config UM
> select HAVE_FUTEX_CMPXCHG if FUTEX
> select HAVE_DEBUG_KMEMLEAK
> select HAVE_DEBUG_BUGVERBOSE
> - select HAVE_COPY_THREAD_TLS
> + select NO_DMA
> select GENERIC_IRQ_SHOW
> select GENERIC_CPU_DEVICES
> select GENERIC_CLOCKEVENTS
This is now a conflict between the sh tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-05 0:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-22 10:38 linux-next: manual merge of the pidfd tree with the sh tree Stephen Rothwell
2020-08-05 0:40 ` 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).