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

Hi Palmer, On Tue, 04 Aug 2020 18:17:35 -0700 (PDT) Palmer Dabbelt wrote: > > >> diff --cc arch/riscv/Kconfig > >> index 76a0cfad3367,f6a3a2bea3d8.. > >> --- a/arch/riscv/Kconfig > >> +++ b/arch/riscv/Kconfig > >> @@@ -57,9 -52,6 +57,8 @@@ config RISC > >>select

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

On Tue, 04 Aug 2020 17:39:43 PDT (-0700), Stephen Rothwell wrote: Hi all, On Mon, 13 Jul 2020 16:58:46 +1000 Stephen Rothwell wrote: Today's linux-next merge of the pidfd tree got a conflict in: arch/riscv/Kconfig between commit: 95ce6c73da3b ("riscv: Enable context tracking")

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

Hi all, On Mon, 13 Jul 2020 16:58:46 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > arch/riscv/Kconfig > > between commit: > > 95ce6c73da3b ("riscv: Enable context tracking") > 929f6a183839 ("riscv: Add kmemleak support") > > from

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

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: arch/riscv/Kconfig between commit: 95ce6c73da3b ("riscv: Enable context tracking") 929f6a183839 ("riscv: Add kmemleak support") from the risc-v tree and commit: 140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")