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

[Stephen Rothwell]

Hi all,

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

  fs/bcachefs/darray.c

between commit:

  97b75b7e275a ("mm/slub: allow to set node and align in k[v]realloc")

from the mm-unstable tree and commit:

  808708fe9da0 ("bcachefs: darray_make_room_rcu()")

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/darray.c
index 928e83a1ce42,6940037bd19e..000000000000
--- a/fs/bcachefs/darray.c
+++ b/fs/bcachefs/darray.c
@@@ -20,10 -22,11 +22,11 @@@ int __bch2_darray_resize_noprof(darray_
  		if (unlikely(check_mul_overflow(new_size, element_size, &bytes)))
  			return -ENOMEM;
  
- 		void *data = likely(bytes < INT_MAX)
+ 		void *old = d->data;
+ 		void *new = likely(bytes < INT_MAX)
 -			? kvmalloc_noprof(bytes, gfp)
 +			? kvmalloc_node_align_noprof(bytes, 1, gfp, NUMA_NO_NODE)
  			: vmalloc_noprof(bytes);
- 		if (!data)
+ 		if (!new)
  			return -ENOMEM;
  
  		if (d->size)

Attachment: pgp_n1_rbtHwP.pgp
Description: OpenPGP digital signature