Stable Archive on lore.kernel.org
 help / color / Atom feed
From: Nathan Chancellor <natechancellor@gmail.com>
To: Sasha Levin <sashal@kernel.org>
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 07:25:38 -0700
Message-ID: <20190411142538.GA3455@archlinux-i9> (raw)
In-Reply-To: <20190411135804.GI11568@sasha-vm>

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...)

Thanks,
Nathan

> --
> Thanks,
> Sasha

  parent reply index

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11  3:51 Nathan Chancellor
2019-04-11 13:58 ` Sasha Levin
2019-04-11 14:21   ` Nathan Chancellor
2019-04-11 14:25   ` Nathan Chancellor [this message]
2019-04-11 14:39     ` Sasha Levin
2019-04-17 18:24 ` Greg Kroah-Hartman
2019-04-17 18:37   ` Nathan Chancellor

Reply instructions:

You may reply publically 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=20190411142538.GA3455@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

Stable Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://lore.kernel.org/stable \
		stable@vger.kernel.org
	public-inbox-index stable

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git