From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>
Cc: Arnd Bergmann <arnd@arndb•de>, Alan Kao <alankao@andestech•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the asm-generic tree
Date: Fri, 25 Mar 2022 09:59:45 +1100 [thread overview]
Message-ID: <20220325095945.28cf4f6b@canb.auug.org.au> (raw)
In-Reply-To: <20220315184840.506dd8bf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
Hi all,
On Tue, 15 Mar 2022 18:48:40 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the userns tree got conflicts in:
>
> arch/nds32/include/asm/syscall.h
> arch/nds32/kernel/ptrace.c
> arch/nds32/kernel/signal.c
>
> between commit:
>
> aec499c75cf8 ("nds32: Remove the architecture")
>
> from the asm-generic tree and commits:
>
> 153474ba1a4a ("ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h")
> 03248addadf1 ("resume_user_mode: Move to resume_user_mode.h")
>
> from the userns tree.
>
> I fixed it up (I just removed the files) 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.
These are now conflicts between the userns 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:[~2022-03-24 22:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 7:48 linux-next: manual merge of the userns tree with the asm-generic tree Stephen Rothwell
2022-03-24 22:59 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 6:51 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=20220325095945.28cf4f6b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alankao@andestech$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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