Hi all,

Today's linux-next merge of the security tree got conflicts in:

  include/linux/security.h
  include/linux/lsm_hook_defs.h

between commit:

  ad664d41535a5 ("fs: port ->tmpfile() to pass const mnt_idmap")

from the vfs-brauner tree and commit:

  16959c469f232 ("lsm: expose mount idmaps to inode hooks")

from the security 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.

diff --cc include/linux/lsm_hook_defs.h
index c9561564585e7,af9624c30f99d..0000000000000
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
@@@ -121,29 -120,30 +121,35 @@@ LSM_HOOK(int, -EOPNOTSUPP, inode_init_s
  	 int *xattr_count)
  LSM_HOOK(int, 0, inode_init_security_anon, struct inode *inode,
  	 const struct qstr *name, const struct inode *context_inode)
- LSM_HOOK(int, 0, inode_create, struct inode *dir, struct dentry *dentry,
- 	 umode_t mode)
 -LSM_HOOK(int, 0, inode_create, struct mnt_idmap *idmap, struct inode *dir,
++LSM_HOOK(int, 0, inode_create, const struct mnt_idmap *idmap, struct inode *dir,
+ 	 struct dentry *dentry, umode_t mode)
 -LSM_HOOK(void, LSM_RET_VOID, inode_post_create_tmpfile, struct mnt_idmap *idmap,
 +LSM_HOOK(void, LSM_RET_VOID, inode_post_create_tmpfile, const struct mnt_idmap *idmap,
  	 struct inode *inode)
- LSM_HOOK(int, 0, inode_link, struct dentry *old_dentry, struct inode *dir,
- 	 struct dentry *new_dentry)
+ LSM_HOOK(int, 0, inode_link, struct mnt_idmap *idmap,
+ 	 struct dentry *old_dentry, struct inode *dir, struct dentry *new_dentry)
  LSM_HOOK(int, 0, inode_unlink, struct inode *dir, struct dentry *dentry)
- LSM_HOOK(int, 0, inode_symlink, struct inode *dir, struct dentry *dentry,
- 	 const char *old_name)
- LSM_HOOK(int, 0, inode_mkdir, struct inode *dir, struct dentry *dentry,
- 	 umode_t mode)
+ LSM_HOOK(int, 0, inode_symlink, struct mnt_idmap *idmap, struct inode *dir,
+ 	 struct dentry *dentry, const char *old_name)
+ LSM_HOOK(int, 0, inode_mkdir, struct mnt_idmap *idmap, struct inode *dir,
+ 	 struct dentry *dentry, umode_t mode)
  LSM_HOOK(int, 0, inode_rmdir, struct inode *dir, struct dentry *dentry)
- LSM_HOOK(int, 0, inode_mknod, struct inode *dir, struct dentry *dentry,
- 	 umode_t mode, dev_t dev)
+ LSM_HOOK(int, 0, inode_mknod, struct mnt_idmap *idmap, struct inode *dir,
+ 	 struct dentry *dentry, umode_t mode, dev_t dev)
  LSM_HOOK(int, 0, inode_rename, struct inode *old_dir, struct dentry *old_dentry,
  	 struct inode *new_dir, struct dentry *new_dentry)
  LSM_HOOK(int, 0, inode_readlink, struct dentry *dentry)
  LSM_HOOK(int, 0, inode_follow_link, struct dentry *dentry, struct inode *inode,
  	 bool rcu)
++<<<<<<< HEAD
 +LSM_HOOK(int, 0, inode_permission, struct inode *inode, int mask)
 +LSM_HOOK(int, 0, inode_setattr, const struct mnt_idmap *idmap, struct dentry *dentry,
++=======
+ LSM_HOOK(int, 0, inode_permission, struct mnt_idmap *idmap,
+ 	 struct inode *inode, int mask)
+ LSM_HOOK(int, 0, inode_setattr, struct mnt_idmap *idmap, struct dentry *dentry,
++>>>>>>> security/next
  	 struct iattr *attr)
 -LSM_HOOK(void, LSM_RET_VOID, inode_post_setattr, struct mnt_idmap *idmap,
 +LSM_HOOK(void, LSM_RET_VOID, inode_post_setattr, const struct mnt_idmap *idmap,
  	 struct dentry *dentry, int ia_valid)
  LSM_HOOK(int, 0, inode_getattr, const struct path *path)
  LSM_HOOK(int, 0, inode_xattr_skipcap, const char *name)
diff --cc include/linux/ns/ns_common_types.h
index 6ed6b497831c7,5cfe0ce3c8818..0000000000000
--- a/include/linux/ns/ns_common_types.h
+++ b/include/linux/ns/ns_common_types.h
@@@ -116,8 -116,13 +116,11 @@@ struct ns_common 
  	struct dentry *stashed;
  	const struct proc_ns_operations *ops;
  	unsigned int inum;
 +	struct ns_tree;
 +	struct rcu_head ns_rcu;
+ #ifdef CONFIG_SECURITY
+ 	void *ns_security;
+ #endif
 -	union {
 -		struct ns_tree;
 -		struct rcu_head ns_rcu;
 -	};
  };
  
  #define to_ns_common(__ns)                                    \
diff --cc include/linux/security.h
index f7ff72ff956b7,7bb073f734f60..0000000000000
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@@ -405,33 -406,37 +407,37 @@@ int security_inode_init_security(struc
  int security_inode_init_security_anon(struct inode *inode,
  				      const struct qstr *name,
  				      const struct inode *context_inode);
- int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);
 -int security_inode_create(struct mnt_idmap *idmap, struct inode *dir,
++int security_inode_create(const struct mnt_idmap *idmap, struct inode *dir,
+ 			  struct dentry *dentry, umode_t mode);
 -void security_inode_post_create_tmpfile(struct mnt_idmap *idmap,
 +void security_inode_post_create_tmpfile(const struct mnt_idmap *idmap,
  					struct inode *inode);
- int security_inode_link(struct dentry *old_dentry, struct inode *dir,
- 			 struct dentry *new_dentry);
+ int security_inode_link(struct mnt_idmap *idmap, struct dentry *old_dentry,
+ 			struct inode *dir, struct dentry *new_dentry);
  int security_inode_unlink(struct inode *dir, struct dentry *dentry);
- int security_inode_symlink(struct inode *dir, struct dentry *dentry,
- 			   const char *old_name);
- int security_inode_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
+ int security_inode_symlink(struct mnt_idmap *idmap, struct inode *dir,
+ 			   struct dentry *dentry, const char *old_name);
+ int security_inode_mkdir(struct mnt_idmap *idmap, struct inode *dir,
+ 			 struct dentry *dentry, umode_t mode);
  int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
- int security_inode_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev);
+ int security_inode_mknod(struct mnt_idmap *idmap, struct inode *dir,
+ 			 struct dentry *dentry, umode_t mode, dev_t dev);
  int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
  			  struct inode *new_dir, struct dentry *new_dentry,
  			  unsigned int flags);
  int security_inode_readlink(struct dentry *dentry);
  int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
  			       bool rcu);
- int security_inode_permission(struct inode *inode, int mask);
 -int security_inode_permission(struct mnt_idmap *idmap, struct inode *inode,
++int security_inode_permission(const struct mnt_idmap *idmap, struct inode *inode,
+ 			      int mask);
 -int security_inode_setattr(struct mnt_idmap *idmap,
 +int security_inode_setattr(const struct mnt_idmap *idmap,
  			   struct dentry *dentry, struct iattr *attr);
 -void security_inode_post_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
 +void security_inode_post_setattr(const struct mnt_idmap *idmap, struct dentry *dentry,
  				 int ia_valid);
  int security_inode_getattr(const struct path *path);
 -int security_inode_setxattr(struct mnt_idmap *idmap,
 +int security_inode_setxattr(const struct mnt_idmap *idmap,
  			    struct dentry *dentry, const char *name,
  			    const void *value, size_t size, int flags);
 -int security_inode_set_acl(struct mnt_idmap *idmap,
 +int security_inode_set_acl(const struct mnt_idmap *idmap,
  			   struct dentry *dentry, const char *acl_name,
  			   struct posix_acl *kacl);
  void security_inode_post_set_acl(struct dentry *dentry, const char *acl_name,
@@@ -917,12 -920,13 +927,13 @@@ static inline int security_inode_create
  }
  
  static inline void
 -security_inode_post_create_tmpfile(struct mnt_idmap *idmap, struct inode *inode)
 +security_inode_post_create_tmpfile(const struct mnt_idmap *idmap, struct inode *inode)
  { }
  
- static inline int security_inode_link(struct dentry *old_dentry,
- 				       struct inode *dir,
- 				       struct dentry *new_dentry)
+ static inline int security_inode_link(struct mnt_idmap *idmap,
+ 				      struct dentry *old_dentry,
+ 				      struct inode *dir,
+ 				      struct dentry *new_dentry)
  {
  	return 0;
  }
diff --git a/security/security.c b/security/security.c
index 5e5c73bfdd93a..09b0af1c0d656 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1662,7 +1662,7 @@ int security_path_chroot(const struct path *path)
  *
  * Return: Returns 0 if permission is granted.
  */
-int security_inode_create(struct mnt_idmap *idmap, struct inode *dir,
+int security_inode_create(const struct mnt_idmap *idmap, struct inode *dir,
 			  struct dentry *dentry, umode_t mode)
 {
 	if (unlikely(IS_PRIVATE(dir)))