Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 25 Jan 2021 17:14:14 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <christian@brauner.io>,
        "Darrick J. Wong" <djwong@kernel.org>,
        David Chinner <david@fromorbit.com>, linux-xfs@vger.kernel.org
Cc:     Christian Brauner <christian.brauner@ubuntu.com>,
        Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the pidfd tree with the xfs tree
Message-ID: <20210125171414.41ed957a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Z_k.r3XxHa=_3.RlzMH+/Th";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Z_k.r3XxHa=_3.RlzMH+/Th
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/xfs/xfs_inode.c

between commit:

  01ea173e103e ("xfs: fix up non-directory creation in SGID directories")

from the xfs tree and commit:

  f736d93d76d3 ("xfs: support idmapped mounts")

from the pidfd 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 fs/xfs/xfs_inode.c
index e2a1db4cee43,95b7f2ba4e06..000000000000
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@@ -809,13 -810,13 +810,13 @@@ xfs_init_new_inode
  	inode->i_rdev =3D rdev;
  	ip->i_d.di_projid =3D prid;
 =20
 -	if (pip && XFS_INHERIT_GID(pip)) {
 -		inode->i_gid =3D VFS_I(pip)->i_gid;
 -		if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))
 -			inode->i_mode |=3D S_ISGID;
 +	if (dir && !(dir->i_mode & S_ISGID) &&
 +	    (mp->m_flags & XFS_MOUNT_GRPID)) {
 +		inode->i_uid =3D current_fsuid();
 +		inode->i_gid =3D dir->i_gid;
 +		inode->i_mode =3D mode;
  	} else {
- 		inode_init_owner(inode, dir, mode);
 -		inode->i_gid =3D fsgid_into_mnt(mnt_userns);
++		inode_init_owner(mnt_userns, inode, dir, mode);
  	}
 =20
  	/*

--Sig_/Z_k.r3XxHa=_3.RlzMH+/Th
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAOYbYACgkQAVBC80lX
0Gwalwf+Jb/6xvzPgL/wE/D9U352Cd/j3gmeB/rrkmZt71DHqlNT4aNkeXg8E20r
Cm2uk8J9CUodQ70VNWbhOF1o8kpGouLvk8q43QUGk9SrkfswpMzYRbcGaGeahQ2D
994wCjRkGhEiKGEZRMeH/9SEOMNnzVHAGtHU67P+43wIx52ohd+l432xi18dIFN/
SeZ6dN4wpJnLsaQyuICjF/qJlA0XL1E93zeAfiFVQH5hBVEQd4Kn32cxl7970lu0
qcOLjt6Wqn/P6hKh60V+bwTsvyZUDHkkiUrVA+ziBI4ZXuSv1txYa7bPBHIhTmxg
t7NX/YDbmA9KwhxBGBprnJLgJp7mCQ==
=bBhL
-----END PGP SIGNATURE-----

--Sig_/Z_k.r3XxHa=_3.RlzMH+/Th--