From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Michal Marek <mmarek@suse.com>, Emese Revfy <re.emese@gmail.com>
Subject: linux-next: manual merge of the kspp tree with Linus' tree
Date: Wed, 8 Feb 2017 12:41:06 +1100 [thread overview]
Message-ID: <20170208124106.7f5ed322@canb.auug.org.au> (raw)
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
include/asm-generic/asm-prototypes.h
between commit:
c7858bf16c0b ("asm-prototypes: Clear any CPP defines before declaring the functions")
from Linus' tree and commit:
e89c98504d89 ("initify: Mark functions with the __nocapture attribute")
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 include/asm-generic/asm-prototypes.h
index 939869c772b1,ea784e02b28e..000000000000
--- a/include/asm-generic/asm-prototypes.h
+++ b/include/asm-generic/asm-prototypes.h
@@@ -1,13 -1,7 +1,13 @@@
#include <linux/bitops.h>
+#undef __memset
extern void *__memset(void *, int, __kernel_size_t);
+#undef __memcpy
- extern void *__memcpy(void *, const void *, __kernel_size_t);
+ extern void *__memcpy(void *, const void *, __kernel_size_t) __nocapture(2);
+#undef __memmove
- extern void *__memmove(void *, const void *, __kernel_size_t);
+ extern void *__memmove(void *, const void *, __kernel_size_t) __nocapture(2);
+#undef memset
extern void *memset(void *, int, __kernel_size_t);
+#undef memcpy
- extern void *memcpy(void *, const void *, __kernel_size_t);
+ extern void *memcpy(void *, const void *, __kernel_size_t) __nocapture(2);
+#undef memmove
- extern void *memmove(void *, const void *, __kernel_size_t);
+ extern void *memmove(void *, const void *, __kernel_size_t) __nocapture(2);
next reply other threads:[~2017-02-08 1:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 1:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 10:49 linux-next: manual merge of the kspp tree with Linus' tree Stephen Rothwell
2021-09-14 4:04 Stephen Rothwell
2021-06-11 6:17 Stephen Rothwell
2020-10-09 6:41 Stephen Rothwell
2020-06-29 5:43 Stephen Rothwell
2020-04-08 2:00 Stephen Rothwell
2020-01-06 4:48 Stephen Rothwell
2016-11-08 2:31 Stephen Rothwell
2016-11-08 18:44 ` Kees Cook
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=20170208124106.7f5ed322@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.com \
--cc=re.emese@gmail.com \
/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 NNTP newsgroup(s).