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:

  include/linux/fs.h

between commit:

  77b863655092 ("fs: add a flag to indicate the fs supports pre-content events")

from the ext3 tree and commit:

  a037d5e7f81b ("fs: add infrastructure for 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 include/linux/fs.h
index 6f3a50c0a958,a6b2addd80db..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2501,7 -2542,7 +2543,8 @@@ struct file_system_type 
  #define FS_USERNS_MOUNT		8	/* Can be mounted by userns root */
  #define FS_DISALLOW_NOTIFY_PERM	16	/* Disable fanotify permission events */
  #define FS_ALLOW_IDMAP         32      /* FS has been updated to handle vfs idmappings. */
 -#define FS_MGTIME		64	/* FS uses multigrain timestamps */
 +#define FS_ALLOW_HSM		64	/* FS can handle fanotify pre-content events. */
++#define FS_MGTIME		128	/* FS uses multigrain timestamps */
  #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move() during rename() internally. */
  	int (*init_fs_context)(struct fs_context *);
  	const struct fs_parameter_spec *parameters;

Attachment: pgpmevtwDv1t6.pgp
Description: OpenPGP digital signature