From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nicholas Piggin <npiggin@gmail.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the userns tree
Date: Mon, 11 Oct 2021 09:03:22 -0500 [thread overview]
Message-ID: <87bl3vbqvp.fsf@disp2133> (raw)
In-Reply-To: <20211011174103.58413a7b@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 11 Oct 2021 17:41:03 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> kernel/exit.c
>
> between commits:
>
> d67e03e36161 ("exit: Factor coredump_exit_mm out of exit_mm")
> 92307383082d ("coredump: Don't perform any cleanups before dumping core")
>
> from the userns tree and commit:
>
> 27692e64c49c ("lazy tlb: introduce lazy mm refcount helper functions")
>
> from the akpm-current 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.
Thanks. This looks like a trivial conflict, and the resolution looks
correct.
Eric
next prev parent reply other threads:[~2021-10-11 14:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 6:41 linux-next: manual merge of the akpm-current tree with the userns tree Stephen Rothwell
2021-10-11 14:03 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-21 11:07 Stephen Rothwell
2021-12-24 7:45 ` Stephen Rothwell
2020-07-09 7:57 Stephen Rothwell
2020-05-22 11:55 Stephen Rothwell
2020-05-12 10:53 Stephen Rothwell
2017-01-25 5:08 Stephen Rothwell
2017-01-26 0:59 ` Eric W. Biederman
2017-01-26 1:43 ` Andrew Morton
2017-01-26 3:55 ` Stephen Rothwell
2016-09-30 7:42 Stephen Rothwell
2016-09-30 9:48 ` Ian Kent
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=87bl3vbqvp.fsf@disp2133 \
--to=ebiederm@xmission.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=npiggin@gmail.com \
--cc=sfr@canb.auug.org.au \
/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).