Hi all,
On Wed, 20 Jun 2018 11:44:41 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgpNUXCvfg4rB.pgp
Description: OpenPGP digital signature
