From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Kees Cook <keescook@chromium•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Marco Elver <elver@google•com>,
Nick Desaulniers <ndesaulniers@google•com>
Subject: linux-next: manual merge of the akpm-current tree with the kspp tree
Date: Fri, 25 Jun 2021 20:37:26 +1000 [thread overview]
Message-ID: <20210625203726.00383b81@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/compiler_types.h
between commit:
380d53c45ff2 ("compiler_attributes.h: define __no_profile, add to noinstr")
from the kspp tree and commit:
120ae5440ef0 ("kcov: add __no_sanitize_coverage to fix noinstr for all architectures")
from the akpm-current 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 include/linux/compiler_types.h
index d509169860f1,cc2bee7f0977..000000000000
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@@ -210,7 -210,7 +210,7 @@@ struct ftrace_likely_data
/* Section for code which can't be instrumented at all */
#define noinstr \
noinline notrace __attribute((__section__(".noinstr.text"))) \
- __no_kcsan __no_sanitize_address __no_profile
- __no_kcsan __no_sanitize_address __no_sanitize_coverage
++ __no_kcsan __no_sanitize_address __no_sanitize_coverage __no_profile
#endif /* __KERNEL__ */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-06-25 10:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 10:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-03 8:15 linux-next: manual merge of the akpm-current tree with the kspp tree Stephen Rothwell
2020-11-25 10:05 Stephen Rothwell
2019-02-13 6:03 Stephen Rothwell
2018-01-15 4:57 Stephen Rothwell
2018-01-15 12:41 ` Arnd Bergmann
2018-01-15 20:07 ` Kees Cook
2017-11-02 8:05 Stephen Rothwell
2017-06-20 5:18 Stephen Rothwell
2017-06-20 5:15 Stephen Rothwell
2017-07-03 1:31 ` Stephen Rothwell
2017-02-17 4:53 Stephen Rothwell
2016-07-27 6:23 Stephen Rothwell
2016-06-22 4: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=20210625203726.00383b81@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=elver@google$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ndesaulniers@google$(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