Hi all,
Today's linux-next merge of the bcachefs tree got a conflict in:
fs/bcachefs/alloc_background.c
between commit:
d39881d2da2a ("bcachefs: add check for missing fragmentation in check_alloc_to_lru_ref()")
from Linus' tree and commit:
f75ad706a1cf ("bcachefs: fsck_err() may now take a btree_trans")
from the bcachefs tree.
I fixed it up (I just used the former where they conflicted) 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
Attachment:
pgpFynEmAgID7.pgp
Description: OpenPGP digital signature
