linux-next: manual merge of the btrfs-fixes tree with the origin tree

[Mark Brown]

Hi all,

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

  fs/btrfs/zoned.c

between commit:

  53de7ee4e28f6 ("btrfs: zoned: don't fail mount needlessly due to too many active zones")

from the origin tree and commit:

  cc53bd2085c8f ("btrfs: add unlikely annotations to branches leading to EIO")

from the btrfs-fixes 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.

diff --cc fs/btrfs/zoned.c
index f426276e2b6bf,e3341a84f4ab3..0000000000000
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c

Attachment: signature.asc
Description: PGP signature