From: ebiederm@xmission•com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Al Viro <viro@ZenIV•linux.org.uk>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
David Howells <dhowells@redhat•com>
Subject: Re: linux-next: manual merge of the userns tree with the vfs tree
Date: Tue, 19 Jun 2018 05:11:45 -0500 [thread overview]
Message-ID: <874lhz9jby.fsf@xmission.com> (raw)
In-Reply-To: <20180619145605.1eb8e86f@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 19 Jun 2018 14:56:05 +1000")
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the userns tree got conflicts in:
>
> fs/proc/inode.c
> fs/proc/root.c
>
> between commits:
>
> 0223e0999be2 ("procfs: Move proc_fill_super() to fs/proc/root.c")
> 83cd45075c36 ("proc: Add fs_context support to procfs")
>
> from the vfs tree and commit:
>
> cc8cda3af2ba ("proc: Simplify and fix proc by removing the kernel mount")
>
> from the userns tree.
>
> I don't know how to fix this up, so I just dropped the userns tree for
> today (since it only contained that one commit).
The userns tree is a fix for a regression that I am sending to Linus
ASAP. I don't remember any fundamental conflicts. After we get 4.17
sorted out I will worry about this.
Eric
next prev parent reply other threads:[~2018-06-19 10:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-19 4:56 linux-next: manual merge of the userns tree with the vfs tree Stephen Rothwell
2018-06-19 10:11 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-20 2:39 Stephen Rothwell
2018-08-06 7:50 ` Stephen Rothwell
2018-08-06 17:35 ` Eric W. Biederman
2018-06-20 1:44 Stephen Rothwell
2018-06-20 3:31 ` Stephen Rothwell
2015-05-25 9:49 Stephen Rothwell
2014-12-16 3:21 Stephen Rothwell
2014-12-16 4:40 ` Eric W. Biederman
2014-12-10 6:27 Stephen Rothwell
2014-12-10 6:21 Stephen Rothwell
2013-11-08 6:50 Stephen Rothwell
2013-11-08 6:50 Stephen Rothwell
2013-11-08 6:49 Stephen Rothwell
2013-11-08 6:49 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=874lhz9jby.fsf@xmission.com \
--to=ebiederm@xmission$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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