From: Mark Brown <broonie@kernel•org>
To: Rasmus Villemoes <linux@rasmusvillemoes•dk>,
Miguel Ojeda <miguel.ojeda.sandonis@gmail•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>
Cc: linux-arm-kernel@lists•infradead.org,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the arm64 tree with the compiler-attributes tree
Date: Mon, 16 Sep 2019 11:42:31 +0100 [thread overview]
Message-ID: <20190916104231.GX4352@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
init/Kconfig
between commit:
eb111869301e15b7373 ("compiler-types.h: add asm_inline definition")
from the compiler-attributes tree and commit:
2d122942484c20b ("Revert "init/Kconfig: Fix infinite Kconfig recursion on PPC"")
from the arm64 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.
diff --cc init/Kconfig
index 257e428c90472,d96127ebc44e0..cebadd0cfa50e
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -30,9 -30,9 +30,12 @@@ config CC_CAN_LIN
config CC_HAS_ASM_GOTO
def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))
+config CC_HAS_ASM_INLINE
+ def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null)
+
+ config TOOLS_SUPPORT_RELR
+ def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
+
config CC_HAS_WARN_MAYBE_UNINITIALIZED
def_bool $(cc-option,-Wmaybe-uninitialized)
help
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-09-16 10:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190916104231.GX4352@sirena.co.uk \
--to=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@rasmusvillemoes$(echo .)dk \
--cc=miguel.ojeda.sandonis@gmail$(echo .)com \
--cc=will@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