Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Tue, 31 Oct 2023 09:30:24 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Qi Zheng <zhengqi.arch@bytedance.com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the mm
 tree
Message-ID: <20231031093024.41459c83@canb.auug.org.au>
In-Reply-To: <20230928102504.5c751249@canb.auug.org.au>
References: <20230928102504.5c751249@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/A=gKF+pmu7kzhZ+KQC3sxpE";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/A=gKF+pmu7kzhZ+KQC3sxpE
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 28 Sep 2023 10:25:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>=20
>   fs/xfs/xfs_buf.c
>=20
> between commit:
>=20
>   5c7b459f9f1d ("xfs: dynamically allocate the xfs-buf shrinker")
>=20
> from the mm tree and commit:
>=20
>   176ccb99e207 ("xfs: Convert to bdev_open_by_path()")
>=20
> from the vfs-brauner 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc fs/xfs/xfs_buf.c
> index 9e7ba04572db,003e157241da..000000000000
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@@ -1943,9 -1945,7 +1943,7 @@@ voi
>   xfs_free_buftarg(
>   	struct xfs_buftarg	*btp)
>   {
> - 	struct block_device	*bdev =3D btp->bt_bdev;
> -=20
>  -	unregister_shrinker(&btp->bt_shrinker);
>  +	shrinker_free(btp->bt_shrinker);
>   	ASSERT(percpu_counter_sum(&btp->bt_io_count) =3D=3D 0);
>   	percpu_counter_destroy(&btp->bt_io_count);
>   	list_lru_destroy(&btp->bt_lru);

This is now a conflict between the mm-stable tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/A=gKF+pmu7kzhZ+KQC3sxpE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVALoAACgkQAVBC80lX
0GweFAf/X6IJ8X0vn60BNOI0BSiXlyapEjmKkz5kSnRpTcP6PvZQaJ53AGjNU7xj
ZgShM00vIlx8j2mMtnFxJrhJobSk0aSIfRN/vFHXiXZquLE4C61A8K70rx7NiO5T
/APL7kBBB0LvgLLWr2BKZMjE/RaIbvS31P8moAmags7dHACRw07EGuz97vsKcTwf
EMqrUNMlYAOhtG/p3N2Yt0bDxFjc96UET8FFR+g++G7ZsX/F3QLbvLEZa3KgTr6Y
z7tnHjhLzx9t1i3nGnlQCATtnkAWVseNYxW6Yi8qFACIF2LghhGkUHfLygxPNYOm
fEEdM85hwDvStknLO68YRq8nT5PXlw==
=FxN2
-----END PGP SIGNATURE-----

--Sig_/A=gKF+pmu7kzhZ+KQC3sxpE--