From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Victor Chibotaru <tchibo@google.com>,
Alexander Potapenko <glider@google.com>
Subject: linux-next: manual merge of the akpm-current tree with the kbuild tree
Date: Thu, 2 Nov 2017 18:13:18 +1100 [thread overview]
Message-ID: <20171102181318.2d017239@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
Makefile
between commit:
2e026cb9ffbb ("kbuild: do not call cc-option before KBUILD_CFLAGS initialization")
from the kbuild tree and commit:
56db01c150f1 ("Makefile: support flag -fsanitizer-coverage=trace-cmp")
from the akpm-current tree.
I fixed it up (mostly - 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 Makefile
index 94e70d8693f3,4ee187f133bb..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -603,12 -619,6 +603,11 @@@ endi
# Defaults to vmlinux, but the arch makefile usually adds further targets
all: vmlinux
+KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
+KBUILD_AFLAGS += $(call cc-option,-fno-PIE)
+CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
- CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,)
+export CFLAGS_GCOV CFLAGS_KCOV
+
# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
# values of the respective KBUILD_* variables
ARCH_CPPFLAGS :=
next reply other threads:[~2017-11-02 7:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 7:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-08 10:34 linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
2021-04-08 10:36 ` Stephen Rothwell
2020-05-11 8:23 Stephen Rothwell
2018-08-03 8:36 Stephen Rothwell
2018-08-15 23:55 ` Stephen Rothwell
2016-01-06 6:54 Stephen Rothwell
2016-01-06 8:07 ` Michal Marek
2013-11-07 6:37 Stephen Rothwell
2013-11-07 9:49 ` Michal Marek
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=20171102181318.2d017239@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=glider@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tchibo@google.com \
--cc=yamada.masahiro@socionext.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).