Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Thu, 28 Sep 2023 10:25:04 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     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: linux-next: manual merge of the vfs-brauner tree with the mm tree
Message-ID: <20230928102504.5c751249@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SMcVosCLCqUTMl3H.Dxy.HK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/SMcVosCLCqUTMl3H.Dxy.HK
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:

  fs/xfs/xfs_buf.c

between commit:

  5c7b459f9f1d ("xfs: dynamically allocate the xfs-buf shrinker")

from the mm tree and commit:

  176ccb99e207 ("xfs: Convert to bdev_open_by_path()")

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 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);

--Sig_/SMcVosCLCqUTMl3H.Dxy.HK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUUx+AACgkQAVBC80lX
0GwEGQgAo9qwNqhpNWmvZNqJFQ13fHE2YhTPOEVqTkSle/ksWeaiz7hChiXk9iUY
YYTKMzpBplapPKsWy6UWJ1Gely7Q5HHMmDs8ZVFUqiZ7o6daPT4uFCpcEKCo4Sgl
rn1+Ng96iKpKwEqS1ESL/7QlYoj1ffMo+0a8dQSHc9xhKkaSkSmt6n8130gqIvOH
uM+lDV/duHeLblRP1x5ic2XddEFKEk4M8t40dlw8F6vGplbDSS2+lahrCpV5LmRC
2Ex/YNwjDnMl40UinvNzvdCUQV5LyWv5Ht8fVczc2A2xqSkVDHqqpjQA4wdMmkHr
JLdTjjLAeDR2IumGut+DiGSignVo6g==
=zbYj
-----END PGP SIGNATURE-----

--Sig_/SMcVosCLCqUTMl3H.Dxy.HK--