From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>,
Al Viro <viro@ZenIV•linux.org.uk>
Cc: 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: Wed, 20 Jun 2018 13:31:06 +1000 [thread overview]
Message-ID: <20180620133106.7d71897a@canb.auug.org.au> (raw)
In-Reply-To: <20180620114441.285f5dfa@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
Hi all,
On Wed, 20 Jun 2018 11:44:41 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> fs/proc/internal.h
>
> between commit:
>
> 0223e0999be2 ("procfs: Move proc_fill_super() to fs/proc/root.c")
>
> from the vfs tree and commit:
>
> 04035aa33a12 ("proc: Don't change mount options on remount failure.")
>
> from the userns tree.
>
> diff --cc fs/proc/internal.h
> index ea8c5468eafc,69fa8d953cde..000000000000
> --- a/fs/proc/internal.h
> +++ b/fs/proc/internal.h
> @@@ -270,10 -252,16 +270,15 @@@ static inline void proc_tty_init(void)
> /*
> * root.c
> */
> + struct proc_mount_options {
> + kgid_t pid_gid;
> + int hide_pid;
> + };
> +
> extern struct proc_dir_entry proc_root;
> -extern int proc_parse_options(char *options, struct proc_mount_options *opts);
>
> extern void proc_self_init(void);
> -extern int proc_remount(struct super_block *, int *, char *);
> +extern int proc_reconfigure(struct super_block *, struct fs_context *);
>
> /*
> * task_[no]mmu.c
The struct proc_mount_options was removed by my later merge resolution.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-06-20 3:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-20 1:44 linux-next: manual merge of the userns tree with the vfs tree Stephen Rothwell
2018-06-20 3:31 ` Stephen Rothwell [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-19 4:56 Stephen Rothwell
2018-06-19 10:11 ` Eric W. Biederman
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=20180620133106.7d71897a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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