Re: linux-next: manual merge of the bpf-next tree with the kbuild tree

[Nathan Chancellor <nathan@kernel.org>]

On Mon, Oct 05, 2026 at 03:37:49PM +0200, Mark Brown wrote:
> On Mon, Oct 05, 2026 at 03:32:24PM +0200, Nathan Chancellor wrote:
> 
> > Can you drop the fix up to scripts/Kconfig.toolchain that you added in
> 
> >   855c706f2179 ("Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git")
> 
> > ? I have temporarily handled this conflict in kbuild-for-next to make
> > life easier for you in
> 
> Done.

This seems to have made its way back into -next, it is currently in the
efi merge:

  aa5bcff53709 ("Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git")

I have the following applied locally on top of next-20261015.

diff --git a/scripts/Kconfig.toolchain b/scripts/Kconfig.toolchain
index 2de66b7bbf70..b0b9a663ddbe 100644
--- a/scripts/Kconfig.toolchain
+++ b/scripts/Kconfig.toolchain
@@ -166,11 +166,6 @@ config CC_OPT_ALLOW_STORE_DATA_RACES_PARAM
 config CC_OPT_NO_ALLOW_STORE_DATA_RACES
 	def_string "$(cc-option-str,-fno-allow-store-data-races)"
 
-config CC_OPT_INLINE_MEMSET
-        string
-        default "-finline-stringops=memset" if $(cc-option,-finline-stringops=memset)
-        default "-mllvm -max-store-memset=4294967295" if $(cc-option,-mllvm -max-store-memset=4294967295)
-
 config CC_HAS_MNOP_MCOUNT
 	def_bool $(cc-option,-mnop-mcount)
 
-- 
Cheers,
Nathan