From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Sterba <dsterba@suse•cz>
Cc: David Sterba <dsterba@suse•com>, Qu Wenruo <wqu@suse•com>,
Johannes Thumshirn <johannes.thumshirn@wdc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the btrfs tree
Date: Thu, 18 Dec 2025 09:26:55 +1100 [thread overview]
Message-ID: <20251218092655.4fe4165c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]
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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 18 Dec 2025 09:21:11 +1100
Subject: [PATCH] fix up for "btrfs: shrink the size of btrfs_bio"
interacting with commit
ad93f92010a1 ("btrfs: zoned: don't zone append to conventional zone")
from the btrfs-fixes tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/btrfs/bio.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fs/btrfs/bio.h b/fs/btrfs/bio.h
index 4d0f416a8be0..157cdfa2f78a 100644
--- a/fs/btrfs/bio.h
+++ b/fs/btrfs/bio.h
@@ -96,9 +96,6 @@ struct btrfs_bio {
/* Whether the bio is written using zone append. */
bool can_use_append:1;
- /* Whether the bio is written using zone append. */
- bool can_use_append;
-
/*
* This member must come last, bio_alloc_bioset will allocate enough
* bytes for entire btrfs_bio but relies on bio being last.
--
2.52.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-12-17 22:26 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-17 22:26 Stephen Rothwell [this message]
2025-12-18 12:14 ` linux-next: build failure after merge of the btrfs tree David Sterba
-- strict thread matches above, loose matches on Subject: below --
2025-02-26 23:32 Stephen Rothwell
2025-02-27 9:40 ` David Sterba
2024-10-23 21:57 Stephen Rothwell
2024-10-23 22:28 ` Qu Wenruo
2024-10-24 0:47 ` David Sterba
2024-10-24 0:52 ` Qu Wenruo
2024-10-24 1:05 ` David Sterba
2024-10-24 1:00 ` Stephen Rothwell
2024-10-27 22:03 ` Stephen Rothwell
2024-10-29 16:21 ` David Sterba
2023-01-12 23:36 Stephen Rothwell
2023-01-13 10:59 ` David Sterba
2022-11-07 22:42 Stephen Rothwell
2022-11-08 11:21 ` David Sterba
2022-09-06 19:44 Stephen Rothwell
2022-08-21 23:44 Stephen Rothwell
2021-10-27 10:09 Stephen Rothwell
2021-10-29 8:28 ` Stephen Rothwell
2021-10-29 9:52 ` David Sterba
2021-10-29 10:50 ` David Sterba
[not found] ` <CAHp75VdXJEuY86pFC+bLoGbAYuGsA+KqEV-g4Dca25HHD-njHA@mail.gmail.com>
2021-10-29 12:14 ` David Sterba
2021-10-31 4:30 ` Stephen Rothwell
2021-10-08 4:03 Stephen Rothwell
2021-10-08 5:56 ` Qu Wenruo
2020-04-21 0:25 Stephen Rothwell
2020-04-21 0:40 ` Qu Wenruo
2020-04-21 1:13 ` Stephen Rothwell
2020-04-21 1:33 ` Qu Wenruo
2020-04-21 1:55 ` Stephen Rothwell
2020-04-22 21:29 ` David Sterba
2020-04-24 5:17 ` Qu Wenruo
2020-02-19 22:23 Stephen Rothwell
2020-02-21 11:30 ` David Sterba
2020-02-21 11:33 ` David Sterba
2015-08-21 0:42 Stephen Rothwell
2012-12-16 23:00 Stephen Rothwell
2012-12-17 0:15 ` Chris Mason
2012-12-17 2:52 ` Chris Mason
2012-12-17 3:13 ` Stephen Rothwell
2012-12-17 3:38 ` Chris Mason
2012-12-17 2:01 ` Chris Mason
2012-10-01 4:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251218092655.4fe4165c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dsterba@suse$(echo .)com \
--cc=dsterba@suse$(echo .)cz \
--cc=johannes.thumshirn@wdc$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wqu@suse$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox