Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Wed, 1 Nov 2023 09:50:02 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kent Overstreet <kent.overstreet@linux.dev>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     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 bcachefs tree with the mm tree
Message-ID: <20231101095002.737cedb8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/UjKdMn7cI9InZx1MbFBjZO4";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

Today's linux-next merge of the bcachefs tree got conflicts in:

  fs/bcachefs/btree_cache.c
  fs/bcachefs/btree_key_cache.c

between commit:

  e1ae18bfd5bc ("Merge branch 'mm-everything' of git://git.kernel.org/pub/s=
cm/linux/kernel/git/akpm/mm")
(this merge commit includes fix up for the shrinker allocation changes)

from the mm tree and commit:

  a1d97d8417d3 ("bcachefs: Fix shrinker names")

from the bcachefs 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/bcachefs/btree_cache.c
index 5e5858191905,0b084fbc478a..000000000000
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@@ -472,15 -473,12 +472,15 @@@ int bch2_fs_btree_cache_init(struct bch
 =20
  	mutex_init(&c->verify_lock);
 =20
- 	shrink =3D shrinker_alloc(0, "%s/btree_cache", c->name);
 -	bc->shrink.count_objects	=3D bch2_btree_cache_count;
 -	bc->shrink.scan_objects		=3D bch2_btree_cache_scan;
 -	bc->shrink.seeks		=3D 4;
 -	ret =3D register_shrinker(&bc->shrink, "%s-btree_cache", c->name);
 -	if (ret)
++	shrink =3D shrinker_alloc(0, "%s-btree_cache", c->name);
 +	if (!shrink)
  		goto err;
 +	bc->shrink =3D shrink;
 +	shrink->count_objects	=3D bch2_btree_cache_count;
 +	shrink->scan_objects	=3D bch2_btree_cache_scan;
 +	shrink->seeks		=3D 4;
 +	shrink->private_data	=3D c;
 +	shrinker_register(shrink);
 =20
  	return 0;
  err:
diff --cc fs/bcachefs/btree_key_cache.c
index f9a5e38a085b,3304bff7d464..000000000000
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/btree_key_cache.c
@@@ -1038,15 -1039,11 +1038,15 @@@ int bch2_fs_btree_key_cache_init(struc
 =20
  	bc->table_init_done =3D true;
 =20
- 	shrink =3D shrinker_alloc(0, "%s/btree_key_cache", c->name);
 -	bc->shrink.seeks		=3D 0;
 -	bc->shrink.count_objects	=3D bch2_btree_key_cache_count;
 -	bc->shrink.scan_objects		=3D bch2_btree_key_cache_scan;
 -	if (register_shrinker(&bc->shrink, "%s-btree_key_cache", c->name))
++	shrink =3D shrinker_alloc(0, "%s-btree_key_cache", c->name);
 +	if (!shrink)
  		return -BCH_ERR_ENOMEM_fs_btree_cache_init;
 +	bc->shrink =3D shrink;
 +	shrink->seeks		=3D 0;
 +	shrink->count_objects	=3D bch2_btree_key_cache_count;
 +	shrink->scan_objects	=3D bch2_btree_key_cache_scan;
 +	shrink->private_data	=3D c;
 +	shrinker_register(shrink);
  	return 0;
  }
 =20

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBhJoACgkQAVBC80lX
0GxZzQf/c88Z/IHte83IQmkmqGnYLsMXRdNUPY2G0sWJwKdWqPtuPqfjNEhIwqp7
RKvB35VGrt+FWiWEyXa9QGLvH3JT6/CNJrG43eBJCLFkrUCNw0a3na0r+AEYBtcY
YGSwW1mx4nGyAU03wZfHXx1DDiAdedhKUPO0B0eUI5vTklCBCUUOGKIe8My8lY4z
D02BnOnvcKfJ5AIhNQSYsW+5+iCDyLW8uEuY9dOhTUKQL8aqRhIbLyUmYb3xTTa9
pxqYs4YNV2nnlUkPO6WOgN6Wn06iD3fE4Msxi+NCP+XrJYD/K+Za1wUsiNJZs1nJ
2DtZSoh8ecuWBmk19fBQDpMnjizD9A==
=U57/
-----END PGP SIGNATURE-----

--Sig_/UjKdMn7cI9InZx1MbFBjZO4--