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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 04660C282DC for ; Wed, 17 Apr 2019 18:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC70A206BA for ; Wed, 17 Apr 2019 18:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555525500; bh=z0KRuufGcaPEd5u8zTI+ykUEXUTyldlmk39ZouPaIsQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=Mvuj8XMDhUXXYKjKtDUeARooUoUHKPsHYmjiZ1G217MnU4xEQ/PH0dLY9D2/7HX3g PaSY+lw5G9fpNqyvFbnQITtS7iwDJLprWv9a1GAVWMMXYLk9z6sNSnLj5iajwXzimz df0z4cFz/If5PFtWP3uqBOJs/Pq8ZuMtwtsWbWEI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731305AbfDQSZA (ORCPT ); Wed, 17 Apr 2019 14:25:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:34096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731157AbfDQSZA (ORCPT ); Wed, 17 Apr 2019 14:25:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 4D20320675; Wed, 17 Apr 2019 18:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555525499; bh=z0KRuufGcaPEd5u8zTI+ykUEXUTyldlmk39ZouPaIsQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bYdbC022C7tdq5sB3JF+71HwFcgZNI13kLF7jP025gwq7y6UwqW0YUh5rcm+SVr71 aPDM94E7TytpebrhnzgpSXSvhQauJq0AvAowB6GAWTxKUdiIMf1rWMr3jaEBoq82cV fKebyFwG1menQOMbW9X784Euaf2H7PzJJnQeLMbY= Date: Wed, 17 Apr 2019 20:24:57 +0200 From: Greg Kroah-Hartman To: Nathan Chancellor Cc: Sasha Levin , stable@vger.kernel.org, Alistair Strachan , Sami Tolvanen , Nick Desaulniers Subject: Re: LLD patches for x86_64 Message-ID: <20190417182457.GA5368@kroah.com> References: <20190411035143.GA14196@archlinux-i9> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190411035143.GA14196@archlinux-i9> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 :( thanks for the merge information, maybe next time I will be smart enough to actually follow it correctly... greg k-h