From: Mark Brown <broonie@kernel.org>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: KBuild Mailing List <linux-kbuild@vger.kernel.org>,
Kees Cook <kees@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <ljs@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nsc@kernel.org>
Subject: linux-next: manual merge of the efi tree with the kbuild tree
Date: Fri, 9 Oct 2026 23:41:41 +0200 [thread overview]
Message-ID: <aslflbcgByI1rH2_@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
drivers/firmware/efi/libstub/Makefile
between commit:
454e00cf8ee5a ("kbuild: avoid re-running compiler and linker probes")
from the kbuild tree and commit:
aa712d73350dc ("efi/libstub: Disable kernel stack erasing in the common flags")
from the efi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc drivers/firmware/efi/libstub/Makefile
index 415f63105b481,7bb5e5066c732..0000000000000
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@@ -40,7 -40,8 +40,8 @@@ KBUILD_CFLAGS := $(subst $(CC_FLAGS_F
-D__NO_FORTIFY \
-ffreestanding \
-fno-stack-protector \
+ $(CONFIG_CC_OPT_NO_ADDRSIG) \
+ $(DISABLE_KSTACK_ERASE) \
- $(call cc-option,-fno-addrsig) \
-D__DISABLE_EXPORTS
#
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next reply other threads:[~2026-10-09 21:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-09 21:41 Mark Brown [this message]
2026-10-09 21:52 ` Nathan Chancellor
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=aslflbcgByI1rH2_@sirena.co.uk \
--to=broonie@kernel.org \
--cc=ardb@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®