From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
"Eric W. Biederman" <ebiederm@xmission.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Subject: linux-next: manual merge of the akpm-current tree with the userns tree
Date: Thu, 9 Jul 2020 17:57:51 +1000 [thread overview]
Message-ID: <20200709175751.7adc70b0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/exec.c
between commit:
25cf336de51b ("exec: Remove do_execve_file")
from the userns tree and commit:
538d50d50815 ("umh: fix refcount underflow in fork_usermode_blob().")
from the akpm-current tree.
I fixed it up (I effectively dropped the akpm-current tree patch since
the former commit means that "file" is no longer passed the affected
function) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-09 7:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 7:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-21 11:07 linux-next: manual merge of the akpm-current tree with the userns tree Stephen Rothwell
2021-12-24 7:45 ` Stephen Rothwell
2021-10-11 6:41 Stephen Rothwell
2021-10-11 14:03 ` Eric W. Biederman
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=20200709175751.7adc70b0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
/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).