linux-next: manual merge of the integrity tree with the vfs-brauner tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  fs/overlayfs/super.c

between commit:

  2bc5e5e8167f ("ovl: rely on SB_I_NOUMASK")

from the vfs-brauner tree and commit:

  bc4532e9cd3b ("ima: detect changes to the backing overlay file")

from the integrity 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 fs/overlayfs/super.c
index 1a95ee237fa9,c71d185980c0..000000000000
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@@ -1439,18 -1485,11 +1439,18 @@@ int ovl_fill_super(struct super_block *
  	cap_lower(cred->cap_effective, CAP_SYS_RESOURCE);
  
  	sb->s_magic = OVERLAYFS_SUPER_MAGIC;
 -	sb->s_xattr = ofs->config.userxattr ? ovl_user_xattr_handlers :
 -		ovl_trusted_xattr_handlers;
 +	sb->s_xattr = ovl_xattr_handlers(ofs);
  	sb->s_fs_info = ofs;
 +#ifdef CONFIG_FS_POSIX_ACL
  	sb->s_flags |= SB_POSIXACL;
 +#endif
- 	sb->s_iflags |= SB_I_SKIP_SYNC | SB_I_IMA_UNVERIFIABLE_SIGNATURE;
+ 	sb->s_iflags |= SB_I_SKIP_SYNC;
 +	/*
 +	 * Ensure that umask handling is done by the filesystems used
 +	 * for the the upper layer instead of overlayfs as that would
 +	 * lead to unexpected results.
 +	 */
 +	sb->s_iflags |= SB_I_NOUMASK;
  
  	err = -ENOMEM;
  	root_dentry = ovl_get_root(sb, ctx->upper.dentry, oe);

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