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: 1261 bytes --]

Hi all,

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

  include/linux/shmem_fs.h

between commit:

  1a93dd24f1be ("shmem: quota support")

from the mm tree and commit:

  ad9717ca487a ("shmem: stable directory offsets")

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/shmem_fs.h
index c0058f3bba70,a5454a80ab30..000000000000
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@@ -31,9 -27,7 +31,10 @@@ struct shmem_inode_info 
  	atomic_t		stop_eviction;	/* hold when working on inode */
  	struct timespec64	i_crtime;	/* file creation time */
  	unsigned int		fsflags;	/* flags for FS_IOC_[SG]ETFLAGS */
 +#ifdef CONFIG_TMPFS_QUOTA
 +	struct dquot		*i_dquot[MAXQUOTAS];
 +#endif
+ 	struct offset_ctx	dir_offsets;	/* stable entry offsets */
  	struct inode		vfs_inode;
  };
  

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