Subject: linux-next: manual merge of the block tree with the btrfs tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 21 Dec 2023 13:45:27 +1100

Hi all,

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

  fs/btrfs/zoned.h

between commit:

  eefaf0a1a6f1 ("btrfs: fix typos found by codespell")

from the btrfs tree and commit:

  7437bb73f087 ("block: remove support for the host aware zone model")

from the block 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/btrfs/zoned.h
index f24a5ffb7807,bc1b540c1597..000000000000
--- a/fs/btrfs/zoned.h
+++ b/fs/btrfs/zoned.h
@@@ -319,8 -323,8 +319,8 @@@ static inline bool btrfs_check_device_z
  			(bdev_zone_sectors(bdev) << SECTOR_SHIFT);
  	}
  
 -	/* Do not allow Host Manged zoned device */
 +	/* Do not allow Host Managed zoned device. */
- 	return bdev_zoned_model(bdev) != BLK_ZONED_HM;
+ 	return !bdev_is_zoned(bdev);
  }
  
  static inline bool btrfs_check_super_location(struct btrfs_device *device, u64 pos)