Hi Palmer, On Tue, 04 Aug 2020 18:17:35 -0700 (PDT) Palmer Dabbelt <palmer@xxxxxxxxxxx> wrote: > > >> diff --cc arch/riscv/Kconfig > >> index 76a0cfad3367,f6a3a2bea3d8..000000000000 > >> --- a/arch/riscv/Kconfig > >> +++ b/arch/riscv/Kconfig > >> @@@ -57,9 -52,6 +57,8 @@@ config RISC > >> select HAVE_ARCH_SECCOMP_FILTER > >> select HAVE_ARCH_TRACEHOOK > >> select HAVE_ASM_MODVERSIONS > >> + select HAVE_CONTEXT_TRACKING > >> - select HAVE_COPY_THREAD_TLS > >> + select HAVE_DEBUG_KMEMLEAK > >> select HAVE_DMA_CONTIGUOUS if MMU > >> select HAVE_EBPF_JIT if MMU > >> select HAVE_FUTEX_CMPXCHG if FUTEX > > > > This is now a conflict between the risc-v tree and Linus' tree. > > Thanks. I'd just pulled in some stuff and was intending on sending a PR to > Linus tomorrow (we've got some autobuilders that run overnight that I like to > give a crack at the actual commit before I send anything). For this one I > think the best bet is to just mention it to Linus as a conflict to be fixed -- > the only other thing I can think of would be to rebase my tree, which seems > worse at this point. Its pretty trivial, just mention it. -- Cheers, Stephen Rothwell
Attachment:
pgpIwX5EBSS44.pgp
Description: OpenPGP digital signature
