From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <christian@brauner.io>, Guo Ren <ren_guo@c-sky.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pidfd tree with the csky tree
Date: Wed, 5 Aug 2020 10:16:53 +1000 [thread overview]
Message-ID: <20200805101653.079ef4c0@canb.auug.org.au> (raw)
In-Reply-To: <20200803182550.4c7df8ae@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]
Hi all,
On Mon, 3 Aug 2020 18:25:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> arch/csky/Kconfig
>
> between commits:
>
> e95a4f8cb985 ("csky: Add SECCOMP_FILTER supported")
> 953131e5b5a5 ("csky: Use top-down mmap layout")
> bdcd93ef9afb ("csky: Add context tracking support")
>
> from the csky 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/csky/Kconfig
> index af238739811e,902f1142d550..000000000000
> --- a/arch/csky/Kconfig
> +++ b/arch/csky/Kconfig
> @@@ -39,11 -38,6 +39,10 @@@ config CSK
> select GX6605S_TIMER if CPU_CK610
> select HAVE_ARCH_TRACEHOOK
> select HAVE_ARCH_AUDITSYSCALL
> + select HAVE_ARCH_MMAP_RND_BITS
> + select HAVE_ARCH_SECCOMP_FILTER
> - select HAVE_COPY_THREAD_TLS
> + select HAVE_CONTEXT_TRACKING
> + select HAVE_VIRT_CPU_ACCOUNTING_GEN
> select HAVE_DEBUG_BUGVERBOSE
> select HAVE_DYNAMIC_FTRACE
> select HAVE_DYNAMIC_FTRACE_WITH_REGS
This is now a conflict between the csky 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:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 8:25 linux-next: manual merge of the pidfd tree with the csky tree Stephen Rothwell
2020-08-05 0:16 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-06 5:06 Stephen Rothwell
2020-08-05 0:18 ` Stephen Rothwell
2020-07-06 5:02 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=20200805101653.079ef4c0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian@brauner.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ren_guo@c-sky.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).