linux-next: manual merge of the akpm-current tree with the userns tree

From: Stephen Rothwell
Date: Fri Sep 30 2016 - 03:42:24 EST

Hi Andrew,

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


between commit:

312ddcb332c3 ("mnt: Add a per mount namespace limit on the number of mounts")

from the userns tree and commit:

a0461d15d75c ("vfs: make is_local_mountpoint() usable by others")

from the akpm-current 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.

Stephen Rothwell

diff --cc include/linux/mount.h
index 1172cce949a4,575b7453325a..000000000000
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@@ -96,6 -97,12 +97,14 @@@ extern void mark_mounts_for_expiry(stru

extern dev_t name_to_dev_t(const char *name);

+extern unsigned int sysctl_mount_max;
+ extern bool __is_local_mountpoint(struct dentry *dentry);
+ static inline bool is_local_mountpoint(struct dentry *dentry)
+ {
+ if (!d_mountpoint(dentry))
+ return false;
+ return __is_local_mountpoint(dentry);
+ }
#endif /* _LINUX_MOUNT_H */