From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28E6CC10F13 for ; Thu, 11 Apr 2019 14:39:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EADF02083E for ; Thu, 11 Apr 2019 14:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554993567; bh=jg+UR7fTR8B5QSMpKcvP7qgk6oW8W3V7WPG4zv67oKM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=dzbs4B54YQPK0/IE8Ra1ZuDfU1FmHd76k2Ck2efekavj41879r/lzktLrpC6l2+kr uqG9+MvIjJXawRpRZUDi1vnGpXfVlfgUgbzGfqyyJqRK9kZ73TfO3YgHLGpU3SfBkV qytKPqRpKflDasEBjul4XAZE5DoAehCifAyr5upM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726538AbfDKOj0 (ORCPT ); Thu, 11 Apr 2019 10:39:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:39462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfDKOj0 (ORCPT ); Thu, 11 Apr 2019 10:39:26 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A72A206BA; Thu, 11 Apr 2019 14:39:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554993565; bh=jg+UR7fTR8B5QSMpKcvP7qgk6oW8W3V7WPG4zv67oKM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Mc6Snb04g2XuAGu4V5sQyICkdgBOWbR1C8Bxhf6+ObyL3eo/tHJ8KvnKOWgjNKptz uxqbukgDOTtavOhJ/dQL1M5KugX3/aTvk78wgJ1ArNrDcOixZPByYc8a9bGxiPJG19 B5UiLzjCq1yN95Js+ezAKrzyxXXhNREx3e9llcRU= Date: Thu, 11 Apr 2019 10:39:24 -0400 From: Sasha Levin To: Nathan Chancellor Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alistair Strachan , Sami Tolvanen , Nick Desaulniers Subject: Re: LLD patches for x86_64 Message-ID: <20190411143924.GK11568@sasha-vm> References: <20190411035143.GA14196@archlinux-i9> <20190411135804.GI11568@sasha-vm> <20190411142538.GA3455@archlinux-i9> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20190411142538.GA3455@archlinux-i9> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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