From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michael Ellerman <mpe@ellerman•id.au>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: PowerPC <linuxppc-dev@lists•ozlabs.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nathan Chancellor <nathan@kernel•org>
Subject: linux-next: manual merge of the powerpc tree with the kbuild tree
Date: Wed, 13 Nov 2024 09:52:28 +1100 [thread overview]
Message-ID: <20241113095228.4ac96776@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2119 bytes --]
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Makefile
between commit:
de51342c5157 ("kbuild: add $(objtree)/ prefix to some in-kernel build artifacts")
from the kbuild tree and commit:
bee08a9e6ab0 ("powerpc: Adjust adding stack protector flags to KBUILD_CLAGS for clang")
from the powerpc 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/Makefile
index 321b596d2550,99af7953e844..000000000000
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -402,9 -403,11 +403,11 @@@ prepare: stack_protector_prepar
PHONY += stack_protector_prepare
stack_protector_prepare: prepare0
ifdef CONFIG_PPC64
- $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' $(objtree)/include/generated/asm-offsets.h))
+ $(eval KBUILD_CFLAGS += -mstack-protector-guard=tls -mstack-protector-guard-reg=r13 \
- -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' include/generated/asm-offsets.h))
++ -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' $(objtree)/include/generated/asm-offsets.h))
else
- $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' $(objtree)/include/generated/asm-offsets.h))
+ $(eval KBUILD_CFLAGS += -mstack-protector-guard=tls -mstack-protector-guard-reg=r2 \
- -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h))
++ -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' $(objtree)/include/generated/asm-offsets.h))
endif
endif
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-12 22:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-12 22:52 Stephen Rothwell [this message]
2024-11-14 1:34 ` linux-next: manual merge of the powerpc tree with the kbuild tree Michael Ellerman
2024-11-24 23:32 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 22:16 Stephen Rothwell
2022-10-09 22:17 ` Stephen Rothwell
2022-10-03 22:12 Stephen Rothwell
2022-10-09 22:16 ` Stephen Rothwell
2022-09-29 11:02 broonie
2018-05-30 23:32 Stephen Rothwell
2018-06-07 23:52 ` Stephen Rothwell
2016-09-21 0:24 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=20241113095228.4ac96776@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=nathan@kernel$(echo .)org \
/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