Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/zoned.c
between commits:
0b9e66762aa0 ("btrfs: zoned: traverse devices under chunk_mutex in btrfs_can_activate_zone")
62ed0bf7315b ("btrfs: zoned: remove left over ASSERT checking for single profile")
from the btrfs-fixes tree and commits:
71f3883a5968 ("btrfs: zoned: use RCU list in btrfs_can_activate_zone")
7d5e73a6ef6c ("btrfs: zoned: remove left over ASSERT checking for single profile")
from the btrfs tree.
I fixed it up (I just (arbitrarily) chose the former version) 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:
pgpgOS3O2eZO_.pgp
Description: OpenPGP digital signature
