From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>, greentime.hu@sifive•com
Cc: christian@brauner•io, Paul Walmsley <paul@pwsan•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
tklauser@distanz•ch
Subject: Re: linux-next: manual merge of the pidfd tree with the risc-v tree
Date: Wed, 5 Aug 2020 13:41:38 +1000 [thread overview]
Message-ID: <20200805134138.1697bf4e@canb.auug.org.au> (raw)
In-Reply-To: <mhng-d98d39e0-9fc5-4bad-b7d2-984d0dc638eb@palmerdabbelt-glaptop1>
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
Hi Palmer,
On Tue, 04 Aug 2020 18:17:35 -0700 (PDT) Palmer Dabbelt <palmer@dabbelt•com> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-08-05 3:41 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
2020-08-05 1:17 ` Palmer Dabbelt
2020-08-05 3:41 ` Stephen Rothwell [this message]
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=20200805134138.1697bf4e@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