Subject: Re: linux-next: build failure after merge of the btrfs tree

From: David Sterba <[email-masked]>
Date: Thu, 18 Dec 2025 13:14:22 +0100

On Thu, Dec 18, 2025 at 09:26:55AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the btrfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from fs/btrfs/disk-io.h:12,
>                  from fs/btrfs/super.c:34:
> fs/btrfs/bio.h:100:14: error: duplicate member 'can_use_append'
>   100 |         bool can_use_append;
>       |              ^~~~~~~~~~~~~~
> 
> (and several others similar)
> 
> Caused by commits
> 
>   a9e53c29f361 ("btrfs: shrink the size of btrfs_bio")
>   009334649b08 ("btrfs: zoned: don't zone append to conventional zone")
> 
> interacting with commit
> 
>   ad93f92010a1 ("btrfs: zoned: don't zone append to conventional zone")
> 
> from the btrfs-fixes tree.
> 
> I applied the following merge fix patch for today, but please clean up
> your trees.

Thanks, I'd fixed the build failure locally but forgot to push the
updated branch. It'll be fixed in todays for-next snapshot.