From: Nathan Chancellor <natechancellor@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Sasha Levin <sashal@kernel.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: Wed, 17 Apr 2019 11:37:01 -0700 [thread overview]
Message-ID: <20190417183701.GA2449@archlinux-i9> (raw)
In-Reply-To: <20190417182457.GA5368@kroah.com>
On Wed, Apr 17, 2019 at 08:24:57PM +0200, Greg Kroah-Hartman 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")
>
> Ugh, I just did every single android-common kernel merge today the wrong
> way for this, so sorry about that. You told me the right way to do it,
> and I read it backwards, my fault :(
>
Ah, I see! I could have probably been more clear about how it was going
to conflict as well. At least it wasn't hard to undo, I had a shell one
liner to do most of the work :)
> thanks for the merge information, maybe next time I will be smart enough
> to actually follow it correctly...
I'm glad it was useful, I'll make sure to continue to provide it in the
future.
Thanks for the quick resolution, cheers!
Nathan
>
> greg k-h
prev parent reply other threads:[~2019-04-17 18:37 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
2019-04-17 18:24 ` Greg Kroah-Hartman
2019-04-17 18:37 ` Nathan Chancellor [this message]
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=20190417183701.GA2449@archlinux-i9 \
--to=natechancellor@gmail.com \
--cc=astrachan@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=ndesaulniers@google.com \
--cc=samitolvanen@google.com \
--cc=sashal@kernel.org \
--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 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).