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

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

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

Hi all,

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

  mm/shmem.c

between commit:

  449e3b71c77c ("mm/shmem: remove dead code can not be satisfied by "(CONFIG_SHMEM)&&(!(CONFIG_SHMEM))"")

from the mm tree and commit:

  db58b5eea8a4 ("Revert "tmpfs: add support 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 mm/shmem.c
index be050efe18cb,69595d341882..000000000000
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@@ -4602,7 -4585,11 +4602,7 @@@ static struct file_system_type shmem_fs
  	.parameters	= shmem_fs_parameters,
  #endif
  	.kill_sb	= kill_litter_super,
- 	.fs_flags	= FS_USERNS_MOUNT | FS_ALLOW_IDMAP | FS_MGTIME,
 -#ifdef CONFIG_SHMEM
+ 	.fs_flags	= FS_USERNS_MOUNT | FS_ALLOW_IDMAP,
 -#else
 -	.fs_flags	= FS_USERNS_MOUNT,
 -#endif
  };
  
  void __init shmem_init(void)

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