Subject: linux-next: manual merge of the pidfd tree with the csky tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 6 Jul 2020 15:02:56 +1000

Hi all,

Today's linux-next merge of the pidfd tree got a conflict in:

  arch/csky/Kconfig

between commit:

  f4dd2edafba0 ("csky: add support for SECCOMP and SECCOMP_FILTER")

from the csky 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/csky/Kconfig
index 822362d0598e,902f1142d550..000000000000
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@@ -38,8 -38,6 +38,7 @@@ config CSK
  	select GX6605S_TIMER if CPU_CK610
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_ARCH_AUDITSYSCALL
 +	select HAVE_ARCH_SECCOMP_FILTER
- 	select HAVE_COPY_THREAD_TLS
  	select HAVE_DEBUG_BUGVERBOSE
  	select HAVE_DYNAMIC_FTRACE
  	select HAVE_DYNAMIC_FTRACE_WITH_REGS