Subject: linux-next: manual merge of the risc-v tree with the pidfd-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 8 Jan 2020 09:35:48 +1100

Hi all,

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

  arch/riscv/Kconfig

between commit:

  b57cd1cdb197 ("riscv: Implement copy_thread_tls")

from the pidfd-fixes tree and commit:

  d0f057940663 ("riscv: Add KASAN support")

from the risc-v 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/riscv/Kconfig
index fa7dc03459e7,82e7168a81fa..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -65,7 -65,7 +65,8 @@@ config RISC
  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select ARCH_HAS_GCOV_PROFILE_ALL
 +	select HAVE_COPY_THREAD_TLS
+ 	select HAVE_ARCH_KASAN if MMU && 64BIT
  
  config ARCH_MMAP_RND_BITS_MIN
  	default 18 if 64BIT