From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kspp tree with the kbuild tree
Date: Mon, 13 May 2024 15:13:16 +1000 [thread overview]
Message-ID: <20240513151316.6bd6fc87@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
drivers/misc/lkdtm/Makefile
between commit:
9cf51a6d1de0 ("Makefile: remove redundant tool coverage variables")
from the kbuild tree and commit:
fb28a8862dc4 ("lkdtm: Disable CFI checking for perms functions")
from the kspp 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 drivers/misc/lkdtm/Makefile
index 33fe61152a15,b28701138b4b..000000000000
--- a/drivers/misc/lkdtm/Makefile
+++ b/drivers/misc/lkdtm/Makefile
@@@ -15,7 -15,11 +15,7 @@@ lkdtm-$(CONFIG_PPC_64S_HASH_MMU) += pow
KASAN_SANITIZE_stackleak.o := n
- CFLAGS_REMOVE_rodata.o += $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS)
-KASAN_SANITIZE_rodata.o := n
-KCSAN_SANITIZE_rodata.o := n
-KCOV_INSTRUMENT_rodata.o := n
-OBJECT_FILES_NON_STANDARD_rodata.o := y
+ CFLAGS_REMOVE_rodata.o += $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS) $(CC_FLAGS_CFI)
OBJCOPYFLAGS :=
OBJCOPYFLAGS_rodata_objcopy.o := \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-13 5:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 5:13 Stephen Rothwell [this message]
2024-05-13 18:50 ` linux-next: manual merge of the kspp tree with the kbuild tree Kees Cook
2024-05-14 0:21 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-02-26 5:58 Stephen Rothwell
2024-02-27 2:24 ` Kees Cook
2024-03-13 22:44 ` Stephen Rothwell
2021-08-26 6:48 Stephen Rothwell
2018-08-03 7:30 Stephen Rothwell
2018-08-15 23:56 ` Stephen Rothwell
2018-08-15 23:58 ` 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=20240513151316.6bd6fc87@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).