Subject: linux-next: manual merge of the vfs tree with the fscrypt tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Dec 2018 11:23:45 +1100

Hi all,

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

  include/linux/fs.h

between commit:

  a2bd7d2fc32c ("fs-verity: add setup code, UAPI, and Kconfig")

from the fscrypt tree and commit:

  37744f3d21f8 ("vfs: Implement a filesystem superblock creation/configuration context")
  d5ab33dfd7bc ("vfs: syscall: Add fsinfo() to query filesystem information")

from the vfs 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 include/linux/fs.h
index d7bf524a0517,aae0aec1adb4..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -62,8 -61,10 +62,12 @@@ struct workqueue_struct
  struct iov_iter;
  struct fscrypt_info;
  struct fscrypt_operations;
 +struct fsverity_info;
 +struct fsverity_operations;
+ struct fs_context;
+ struct fs_parameter_description;
+ struct fsinfo_kparams;
+ enum fsinfo_attribute;
  
  extern void __init inode_init(void);
  extern void __init inode_init_early(void);