Hi all,

On Wed, 23 Apr 2025 08:29:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   0343f88be454 ("btrfs: subpage: access correct object when reading bitmap start in subpage_calc_start_bit()")
>   308a921d5c45 ("btrfs: zoned: return EIO on RAID1 block group write pointer mismatch")
>   39b4c6395e2a ("btrfs: fix invalid inode pointer after failure to create reloc inode")
>   4853650cc31d ("btrfs: fix the ASSERT() inside GET_SUBPAGE_BITMAP()")
>   4a50116e0850 ("btrfs: tree-checker: adjust error code for header level check")
>   53dda1b821c4 ("btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()")

The above duplication is causing an unnecessary conflict.

>   5605a0903ce1 ("btrfs: zoned: skip reporting zone for new block group")
>   982446a056f3 ("block: introduce zone capacity helper")

-- 
Cheers,
Stephen Rothwell