linux-next: manual merge of the bcachefs tree with the mm tree

[Stephen Rothwell]

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/scm/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.

-- 
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
  
  	mutex_init(&c->verify_lock);
  
- 	shrink = shrinker_alloc(0, "%s/btree_cache", c->name);
 -	bc->shrink.count_objects	= bch2_btree_cache_count;
 -	bc->shrink.scan_objects		= bch2_btree_cache_scan;
 -	bc->shrink.seeks		= 4;
 -	ret = register_shrinker(&bc->shrink, "%s-btree_cache", c->name);
 -	if (ret)
++	shrink = shrinker_alloc(0, "%s-btree_cache", c->name);
 +	if (!shrink)
  		goto err;
 +	bc->shrink = shrink;
 +	shrink->count_objects	= bch2_btree_cache_count;
 +	shrink->scan_objects	= bch2_btree_cache_scan;
 +	shrink->seeks		= 4;
 +	shrink->private_data	= c;
 +	shrinker_register(shrink);
  
  	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
  
  	bc->table_init_done = true;
  
- 	shrink = shrinker_alloc(0, "%s/btree_key_cache", c->name);
 -	bc->shrink.seeks		= 0;
 -	bc->shrink.count_objects	= bch2_btree_key_cache_count;
 -	bc->shrink.scan_objects		= bch2_btree_key_cache_scan;
 -	if (register_shrinker(&bc->shrink, "%s-btree_key_cache", c->name))
++	shrink = shrinker_alloc(0, "%s-btree_key_cache", c->name);
 +	if (!shrink)
  		return -BCH_ERR_ENOMEM_fs_btree_cache_init;
 +	bc->shrink = shrink;
 +	shrink->seeks		= 0;
 +	shrink->count_objects	= bch2_btree_key_cache_count;
 +	shrink->scan_objects	= bch2_btree_key_cache_scan;
 +	shrink->private_data	= c;
 +	shrinker_register(shrink);
  	return 0;
  }

Attachment: pgpsFZRIiv34I.pgp
Description: OpenPGP digital signature