lkml.org 
[lkml]   [2020]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the risc-v tree with Linus' tree
Hi all,

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

arch/riscv/Kconfig

between commit:

20bda4ed62f5 ("riscv: Implement copy_thread_tls")

from Linus' tree and commit:

d0f057940663 ("riscv: Add KASAN support")
5b800fd350d6 ("riscv: add required functions to enable HAVE_REGS_AND_STACK_ACCESS_API")
a630fb824cf5 ("riscv: Add support for restartable sequence")

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,9220071bb7da..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -65,7 -63,9 +63,10 @@@ 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
+ select HAVE_REGS_AND_STACK_ACCESS_API
+ select HAVE_RSEQ

config ARCH_MMAP_RND_BITS_MIN
default 18 if 64BIT
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-01-13 23:06    [W:0.035 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site