From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Guo Ren <ren_guo@c-sky.com>
Cc: Kees Cook <keescook@chromium.org>,
Guo Ren <guoren@linux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
YiFei Zhu <yifeifz2@illinois.edu>
Subject: Re: linux-next: manual merge of the seccomp tree with the csky tree
Date: Thu, 17 Dec 2020 12:23:54 +1100 [thread overview]
Message-ID: <20201217122354.6ad6b052@canb.auug.org.au> (raw)
In-Reply-To: <20201125173824.0e3dbcd7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
Hi aa,
On Wed, 25 Nov 2020 17:38:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the seccomp tree got a conflict in:
>
> arch/csky/include/asm/Kbuild
>
> between commit:
>
> fed76f8679a6 ("csky: Add QUEUED_SPINLOCKS supported")
>
> from the csky tree and commit:
>
> 6e9ae6f98809 ("csky: Enable seccomp architecture tracking")
>
> from the seccomp 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/include/asm/Kbuild
> index f814d46d347f,93372255984d..000000000000
> --- a/arch/csky/include/asm/Kbuild
> +++ b/arch/csky/include/asm/Kbuild
> @@@ -3,9 -3,6 +3,8 @@@ generic-y += asm-offsets.
> generic-y += gpio.h
> generic-y += kvm_para.h
> generic-y += local64.h
> +generic-y += mcs_spinlock.h
> generic-y += qrwlock.h
> +generic-y += qspinlock.h
> - generic-y += seccomp.h
> generic-y += user.h
> generic-y += vmlinux.lds.h
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 --]
prev parent reply other threads:[~2020-12-17 1:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 6:38 linux-next: manual merge of the seccomp tree with the csky tree Stephen Rothwell
2020-12-17 1:23 ` 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=20201217122354.6ad6b052@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=guoren@linux.alibaba.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ren_guo@c-sky.com \
--cc=yifeifz2@illinois.edu \
/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).