From: Sasha Levin <sashal@kernel.org>
To: Nathan Chancellor <natechancellor@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Alistair Strachan <astrachan@google.com>,
Sami Tolvanen <samitolvanen@google.com>,
Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: LLD patches for x86_64
Date: Thu, 11 Apr 2019 10:39:24 -0400 [thread overview]
Message-ID: <20190411143924.GK11568@sasha-vm> (raw)
In-Reply-To: <20190411142538.GA3455@archlinux-i9>
On Thu, Apr 11, 2019 at 07:25:38AM -0700, Nathan Chancellor wrote:
>On Thu, Apr 11, 2019 at 09:58:04AM -0400, Sasha Levin wrote:
>> On Wed, Apr 10, 2019 at 08:51:43PM -0700, Nathan Chancellor wrote:
>> > Hi Greg and Sasha,
>> >
>> > Please apply the following mbox files to their respective trees. They
>> > contain upstream patches that allow a tip of tree LLD to link an x86
>> > kernel image as well as a patch to avoid using $(LD) to check for
>> > the location of binutils, which won't always be accurate when linking
>> > with LLD. This was tested with both the upstream defconfig and Android's
>> > x86_64_cuttlefish_defconfig in their respective trees (building/linking
>> > with both Clang/LLD and GCC/ld.bfd then booting in QEMU).
>> >
>> > For 5.0, a simple cherry-pick of commit ad15006cc784 ("kbuild: clang:
>> > choose GCC_TOOLCHAIN_DIR not on LD") will do.
>> >
>> > Greg, the merge into kernel/common will result in two conflicts:
>> >
>> > * Makefile:
>> > Make the diff match upstream commit
>> > ad15006cc784 ("kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD")
>> >
>> > * arch/x86/entry/vdso/Makefile:
>> > Take the right hand side, effectively replacing common commit
>> > 35b779802c2e ("x86: vdso: Fix leaky vdso linker with CC=clang.")
>> > with the proper upstream commit
>> > 379d98ddf413 ("x86: vdso: Use $LD instead of $CC to link")
>>
>> Nathan,
>>
>> I might be missing something, but ad15006cc784 does not touch
>> arch/x86/entry/vdso/Makefile nor does it generate any conflicts.
>>
>
>Hi Sasha,
>
>You are correct. The conflict notes were for when Greg does the LTS
>merge into the Android common kernel, which has an out of tree patch
>that will cause a conflict with ad15006cc784. The conflict in the x86
>vDSO Makefile comes from the other patches in the series. None of that
>matters for upstream.
>
>(resending to drop the fat finger in the To line...)
Got it.
I've queued up all the requested patches.
--
Thanks,
Sasha
next prev parent reply other threads:[~2019-04-11 14:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 3:51 LLD patches for x86_64 Nathan Chancellor
2019-04-11 13:58 ` Sasha Levin
2019-04-11 14:21 ` Nathan Chancellor
2019-04-11 14:25 ` Nathan Chancellor
2019-04-11 14:39 ` Sasha Levin [this message]
2019-04-17 18:24 ` Greg Kroah-Hartman
2019-04-17 18:37 ` Nathan Chancellor
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=20190411143924.GK11568@sasha-vm \
--to=sashal@kernel.org \
--cc=astrachan@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=natechancellor@gmail.com \
--cc=ndesaulniers@google.com \
--cc=samitolvanen@google.com \
--cc=stable@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.