From: Geert Uytterhoeven <geert@linux-m68k•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Yury Norov <yury.norov@gmail•com>,
Miquel Raynal <miquel.raynal@bootlin•com>,
Boris Brezillon <boris.brezillon@collabora•com>,
Richard Genoud <richard.genoud@bootlin•com>,
Geert Uytterhoeven <geert+renesas@glider•be>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the bitmap tree
Date: Tue, 25 Nov 2025 09:05:48 +0100 [thread overview]
Message-ID: <CAMuHMdWpiTwp=mH8uj71NqzWctWUQymT3BqwSRTCO7xOa3bbWQ@mail.gmail.com> (raw)
In-Reply-To: <20251125182442.49ddb53a@canb.auug.org.au>
Hi Stephen,
On Tue, 25 Nov 2025 at 08:24, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> After merging the bitmap tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/mtd/nand/raw/sunxi_nand.c:33:9: error: "field_get" redefined [-Werror]
> 33 | #define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
> | ^~~~~~~~~
> In file included from include/linux/fortify-string.h:5,
> from include/linux/string.h:386,
> from include/linux/bitmap.h:13,
> from include/linux/cpumask.h:11,
> from arch/x86/include/asm/paravirt.h:21,
> from arch/x86/include/asm/cpuid/api.h:57,
> from arch/x86/include/asm/processor.h:19,
> from include/linux/sched.h:13,
> from include/linux/ratelimit.h:6,
> from include/linux/dev_printk.h:16,
> from include/linux/device.h:15,
> from include/linux/dma-mapping.h:5,
> from drivers/mtd/nand/raw/sunxi_nand.c:16:
> include/linux/bitfield.h:298:9: note: this is the location of the previous definition
> 298 | #define field_get(mask, reg) \
> | ^~~~~~~~~
> drivers/mtd/nand/raw/sunxi_nand.c:34:9: error: "field_prep" redefined [-Werror]
> 34 | #define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
> | ^~~~~~~~~~
> include/linux/bitfield.h:278:9: note: this is the location of the previous definition
> 278 | #define field_prep(mask, val) \
> | ^~~~~~~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> c1c6ab80b25c ("bitfield: Add non-constant field_{prep,get}() helpers")
>
> interacting with commits
>
> d21b4338159f ("mtd: rawnand: sunxi: introduce ecc_mode_mask in sunxi_nfc_caps")
> 6fc2619af1eb ("mtd: rawnand: sunxi: rework pattern found registers")
>
> from the nand tree.
>
> I have applied the following hack for today.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 25 Nov 2025 17:47:46 +1100
> Subject: [PATCH] fix up for "bitfield: Add non-constant field_{prep,get}()
> helpers"
>
> interacting with commits
>
> d21b4338159f ("mtd: rawnand: sunxi: introduce ecc_mode_mask in sunxi_nfc_caps")
> 6fc2619af1eb ("mtd: rawnand: sunxi: rework pattern found registers")
>
> from the nand tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/mtd/nand/raw/sunxi_nand.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
> index 031ab651c5a8..b940eb5cf79a 100644
> --- a/drivers/mtd/nand/raw/sunxi_nand.c
> +++ b/drivers/mtd/nand/raw/sunxi_nand.c
> @@ -30,8 +30,8 @@
> #include <linux/reset.h>
>
> /* non compile-time field get/prep */
> -#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
> -#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
> +#define sunxi_field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
> +#define sunxi_field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
See "[PATCH -next v6 11/26] mtd: rawnand: sunxi: #undef
field_{get,prep}() before local definition"[1] and follow-up
"[PATCH -next v6 24/26] mtd: rawnand: sunxi: Convert to common
field_{get,prep}() helpers"[2].
The former unfortunately didn't make it into the nand tree yet...
[1] https://lore.kernel.org/all/703d7eec56074148daed4ea45b637f8a83f15305.1762435376.git.geert+renesas@glider.be
[2] https://lore.kernel.org/all/e1c879967328d8c1098aaa014845c2f11874d7c7.1762435376.git.geert+renesas@glider.be/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2025-11-25 8:06 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 7:24 linux-next: build failure after merge of the bitmap tree Stephen Rothwell
2025-11-25 8:05 ` Geert Uytterhoeven [this message]
2025-11-25 8:31 ` Miquel Raynal
2025-11-25 8:37 ` Geert Uytterhoeven
2025-11-25 14:44 ` Yury Norov
2025-11-25 14:55 ` Miquel Raynal
2025-11-25 8:53 ` Miquel Raynal
2025-11-28 8:17 ` Miquel Raynal
-- strict thread matches above, loose matches on Subject: below --
2026-04-30 9:11 Thierry Reding
2026-03-24 15:11 Mark Brown
2026-03-24 17:56 ` Yury Norov
2025-02-18 5:07 Stephen Rothwell
2025-02-18 10:35 ` Beata Michalska
2025-02-18 13:49 ` Stephen Rothwell
2025-02-18 14:10 ` Catalin Marinas
2025-02-18 14:16 ` Yury Norov
2025-02-18 18:23 ` Catalin Marinas
2025-02-18 19:28 ` Beata Michalska
2025-02-18 19:44 ` Catalin Marinas
2024-05-08 6:27 Stephen Rothwell
2024-05-08 13:24 ` Kuan-Wei Chiu
2024-05-08 22:18 ` Yury Norov
2023-10-20 4:49 Stephen Rothwell
2023-10-19 6:01 Stephen Rothwell
2023-10-19 15:58 ` Yury Norov
2023-10-20 4:24 ` Yury Norov
2023-10-20 4:51 ` Stephen Rothwell
2023-10-20 12:33 ` Yury Norov
2023-11-02 11:41 ` Alexander Lobakin
2022-09-26 23:53 broonie
2022-09-27 0:37 ` Yury Norov
2022-09-27 18:56 ` Mark Brown
2022-09-20 8:08 Stephen Rothwell
2022-09-20 14:49 ` Yury Norov
2022-07-27 10:29 Stephen Rothwell
2022-07-22 9:16 Stephen Rothwell
2022-07-22 19:29 ` Yury Norov
2022-07-15 10:29 Stephen Rothwell
2022-07-08 7:47 Stephen Rothwell
2022-05-02 8:15 Stephen Rothwell
2022-04-19 4:29 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='CAMuHMdWpiTwp=mH8uj71NqzWctWUQymT3BqwSRTCO7xOa3bbWQ@mail.gmail.com' \
--to=geert@linux-m68k$(echo .)org \
--cc=boris.brezillon@collabora$(echo .)com \
--cc=geert+renesas@glider$(echo .)be \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miquel.raynal@bootlin$(echo .)com \
--cc=richard.genoud@bootlin$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yury.norov@gmail$(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