linux-next: manual merge of the userns tree with the block tree

linux-next: manual merge of the userns tree with the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

Hi Eric,

Today's linux-next merge of the userns tree got a conflict in
include/linux/fs.h between commit 89e9b9e07a39 ("writeback: add
{CONFIG|BDI_CAP|FS}_CGROUP_WRITEBACK") from the block tree and commit
1b852bceb0d1 ("mnt: Refactor the logic for mounting sysfs and proc in a
user namespace") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/fs.h
index fe0dcaa3a789,571aab91bfc0..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -1913,7 -1897,7 +1913,8 @@@ struct file_system_type 
  #define FS_HAS_SUBTYPE		4
  #define FS_USERNS_MOUNT		8	/* Can be mounted by userns root */
  #define FS_USERNS_DEV_MOUNT	16 /* A userns mount does not imply MNT_NODEV */
- #define FS_CGROUP_WRITEBACK	32	/* Supports cgroup-aware writeback */
+ #define FS_USERNS_VISIBLE	32	/* FS must already be visible */
++#define FS_CGROUP_WRITEBACK	64	/* Supports cgroup-aware writeback */
  #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move() during rename() internally. */
  	struct dentry *(*mount) (struct file_system_type *, int,
  		       const char *, void *);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the userns tree with the block tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1147 bytes --]

Hi all,

Today's linux-next merge of the userns tree got a conflict in:

  block/blk-cgroup.c

between commit:

  672fdcf0e7de ("block: partition include/linux/blk-cgroup.h")

from the block tree and commit:

  03248addadf1 ("resume_user_mode: Move to resume_user_mode.h")

from the userns tree.

I fixed it up (see below) 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

diff --cc block/blk-cgroup.c
index fa063c6c0338,4d8be1634bc6..000000000000
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@@ -26,7 -26,9 +26,7 @@@
  #include <linux/delay.h>
  #include <linux/atomic.h>
  #include <linux/ctype.h>
- #include <linux/tracehook.h>
 -#include <linux/blk-cgroup.h>
+ #include <linux/resume_user_mode.h>
  #include <linux/psi.h>
  #include <linux/part_stat.h>
  #include "blk.h"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]