From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
"Eric W. Biederman" <ebiederm@xmission.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Aleksa Sarai <asarai@suse.de>
Subject: linux-next: manual merge of the akpm-current tree with the userns tree
Date: Wed, 25 Jan 2017 16:08:35 +1100 [thread overview]
Message-ID: <20170125160835.1b94db55@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/proc/base.c
between commit:
68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces")
from the userns tree and commit:
d15d29b5352f ("procfs: change the owner of non-dumpable and writeable files")
from the akpm-current tree.
I *think* that the former supercedes the latter?
I fixed it up (I just used the former) 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
next reply other threads:[~2017-01-25 5:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 5:08 Stephen Rothwell [this message]
2017-01-26 0:59 ` linux-next: manual merge of the akpm-current tree with the userns tree Eric W. Biederman
2017-01-26 1:43 ` Andrew Morton
2017-01-26 3:55 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-12-21 11:07 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-07-09 7:57 Stephen Rothwell
2020-05-22 11:55 Stephen Rothwell
2020-05-12 10:53 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=20170125160835.1b94db55@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=asarai@suse.de \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).