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, 15 Feb 2021 09:41:31 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "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: Re: linux-next: manual merge of the xfs tree with the pidfd tree
Message-ID: <20210215094131.7b47c1c5@canb.auug.org.au>
In-Reply-To: <20210208103348.1a0beef9@canb.auug.org.au>
References: <20210208103348.1a0beef9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/6AZ6gwpjRrqFrLqMtudqeMW";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/6AZ6gwpjRrqFrLqMtudqeMW
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the xfs tree got a conflict in:
>=20
>   fs/xfs/xfs_ioctl.c
>=20
> between commit:
>=20
>   f736d93d76d3 ("xfs: support idmapped mounts")
>=20
> from the pidfd tree and commit:
>=20
>   7317a03df703 ("xfs: refactor inode ownership change transaction/inode/q=
uota allocation idiom")
>=20
> from the xfs tree.
>=20
> 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
> diff --cc fs/xfs/xfs_ioctl.c
> index 3d4c7ca080fb,248083ea0276..000000000000
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@@ -1280,9 -1275,9 +1280,10 @@@ xfs_ioctl_setattr_prepare_dax
>    */
>   static struct xfs_trans *
>   xfs_ioctl_setattr_get_trans(
> - 	struct file		*file)
>  -	struct xfs_inode	*ip,
> ++	struct file		*file,
> + 	struct xfs_dquot	*pdqp)
>   {
>  +	struct xfs_inode	*ip =3D XFS_I(file_inode(file));
>   	struct xfs_mount	*mp =3D ip->i_mount;
>   	struct xfs_trans	*tp;
>   	int			error =3D -EROFS;
> @@@ -1470,9 -1461,9 +1469,9 @@@ xfs_ioctl_setattr
>  =20
>   	xfs_ioctl_setattr_prepare_dax(ip, fa);
>  =20
> - 	tp =3D xfs_ioctl_setattr_get_trans(file);
>  -	tp =3D xfs_ioctl_setattr_get_trans(ip, pdqp);
> ++	tp =3D xfs_ioctl_setattr_get_trans(file, pdqp);
>   	if (IS_ERR(tp)) {
> - 		code =3D PTR_ERR(tp);
> + 		error =3D PTR_ERR(tp);
>   		goto error_free_dquots;
>   	}
>  =20
> @@@ -1615,7 -1599,7 +1606,7 @@@ xfs_ioc_setxflags
>  =20
>   	xfs_ioctl_setattr_prepare_dax(ip, &fa);
>  =20
> - 	tp =3D xfs_ioctl_setattr_get_trans(filp);
>  -	tp =3D xfs_ioctl_setattr_get_trans(ip, NULL);
> ++	tp =3D xfs_ioctl_setattr_get_trans(filp, NULL);
>   	if (IS_ERR(tp)) {
>   		error =3D PTR_ERR(tp);
>   		goto out_drop_write;

With the merge window about to open, this is a reminder that this
conflict still exists.

--=20
Cheers,
Stephen Rothwell

--Sig_/6AZ6gwpjRrqFrLqMtudqeMW
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAppxsACgkQAVBC80lX
0GwZZAf/YbK/41Cdc4yYXPJk1ft3VGQWAqH4hk7tvT+ncycbyk/JAcm+HIvOVByo
oQ9kW89RXjF+AQ7RPTYZDUkI6vtauSwR+9TbAEWgMz2hRybCKID0oeBPHttdPFrR
kF1lGQivugLXrfJVLUBuxFMEIgSyFPcc9cNsjyncKPM67eTg7iRde/sdf6Y/Aocw
YOvcODmDxCgkFZkOyX+UWfz9cRFD7gBXep5MbBKbo70k1Q29kx3bVuyg2JZrAGBU
Hgn0i8Frs/WnasKlMAoOQu7HL+02gBXGPYOEI62y6DFCy1K/8aft3zo4kDef6BPi
yN8l8EZnPJdCEGWJvmSg/G0rbJX+jA==
=dApK
-----END PGP SIGNATURE-----

--Sig_/6AZ6gwpjRrqFrLqMtudqeMW--