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

[Stephen Rothwell]

Hi all,

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

  fs/xfs/xfs_super.c

between commit:

  436df5326f57 ("xfs: add pre-content fsnotify hook for write faults")

from the ext3 tree and commit:

  3062a738d73c ("xfs: switch to multigrain timestamps")

from the vfs-brauner 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/xfs/xfs_super.c
index 4424217e9269,97c854ed4173..000000000000
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@@ -2051,7 -2064,7 +2063,8 @@@ static struct file_system_type xfs_fs_t
  	.init_fs_context	= xfs_init_fs_context,
  	.parameters		= xfs_fs_parameters,
  	.kill_sb		= xfs_kill_sb,
- 	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_ALLOW_HSM,
 -	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME,
++	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP |
++				  FS_ALLOW_HSM | FS_MGTIME,
  };
  MODULE_ALIAS_FS("xfs");

Attachment: pgpn4oxDbuBuf.pgp
Description: OpenPGP digital signature