From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Greentime Hu <greentime.hu@sifive•com>,
Tobias Klauser <tklauser@distanz•ch>
Subject: Re: linux-next: manual merge of the pidfd tree with the risc-v tree
Date: Wed, 5 Aug 2020 10:39:43 +1000 [thread overview]
Message-ID: <20200805103943.3c28da7f@canb.auug.org.au> (raw)
In-Reply-To: <20200713165846.5166ff82@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]
Hi all,
On Mon, 13 Jul 2020 16:58:46 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 the risc-v 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.
>
> 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-05 0:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 6:58 linux-next: manual merge of the pidfd tree with the risc-v tree Stephen Rothwell
2020-08-05 0:39 ` Stephen Rothwell [this message]
2020-08-05 1:17 ` Palmer Dabbelt
2020-08-05 3:41 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200805103943.3c28da7f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian@brauner$(echo .)io \
--cc=greentime.hu@sifive$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=tklauser@distanz$(echo .)ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox