Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 14 Jul 2023 10:02:05 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Carlos Maiolino <cem@kernel.org>,
        Carlos Maiolino <cmaiolino@redhat.com>,
        Chuck Lever <chuck.lever@oracle.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lukas Czerner <lczerner@redhat.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the mm tree
Message-ID: <20230714100205.35b99670@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/s3va2hQ=MJzQAXQ6E2ARP=t";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/s3va2hQ=MJzQAXQ6E2ARP=t
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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=20
  	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;
  };
 =20

--Sig_/s3va2hQ=MJzQAXQ6E2ARP=t
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSwkH0ACgkQAVBC80lX
0GzDmAgAmEKcMLkzmU2Njc1u6mqPQ16MG6xBQb+F2F/x73dbrIsn5Ys7DAEJj0hH
OeEX3P7SUvmsKq20c/KAYc4+FTSOQmy4S70Ycb9H3EC7mjyjaw9qjFGY5UTzFE1A
fU0ktHKwBYr22xeFL/lueuNDz0P6q4Og3GzbXv+klgX4tdC3cNm154ZAh37iRVxk
uqazOFk2Q2gxJNPnRZBswrh1AqgSbpA4vN9n6S3TtwuSvq+FQMsmaDAll1VHddzJ
XhChSFZdzH3Z9fIVjNF2FssEFuNxQ/mEGvRdu05157DQnvHp5WVdM69CjMCLz6vV
/0wq+FiNLj6lbTL8UC7awVnE83Sljw==
=XDiy
-----END PGP SIGNATURE-----

--Sig_/s3va2hQ=MJzQAXQ6E2ARP=t--