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.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 05395C282DD for ; Wed, 17 Apr 2019 18:37:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5E4820693 for ; Wed, 17 Apr 2019 18:37:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZxrnQKCz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731030AbfDQShG (ORCPT ); Wed, 17 Apr 2019 14:37:06 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:32972 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730040AbfDQShG (ORCPT ); Wed, 17 Apr 2019 14:37:06 -0400 Received: by mail-ed1-f66.google.com with SMTP id d55so21066750ede.0 for ; Wed, 17 Apr 2019 11:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=BF3BCXGrKhpIi+Xw3PfbLp3g7zOZOgGIf+ciJW6++zI=; b=ZxrnQKCzJu+bWpNLyCKWdhpta4cp9axMnlXzpSHJ72qBoA5V8DALTDpd0ePhF6n6TH j6VdMb8Vyx+j2uDnCqZcFPv3iiUkyzo5pA/4Mv124drF6EnECZCPTCLl1Wzz0XTB8IiH ZqEKFYKzVjJcLig5c6z3uQl6WXskUzqlzOhC2xI6XqggvMfPYYWEm3RQDlnCgx4g8e+3 fxPDqhMC0gwQ7d2YWuWCGZ3NlHijcMD/Sd0/+piN29XSPiJhcYepYBJlgPa096QrsTTO s3CYZXaB2oDkWMluFobwre6guPEKGmQnkwGMod4pSDV7GVlyo6SS1xuY8lawJL7CU7+Q 6phQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=BF3BCXGrKhpIi+Xw3PfbLp3g7zOZOgGIf+ciJW6++zI=; b=QR9Zj7ezTVN+MVyfWdbghwCu/rklvJsMChZFqwrr+CyGL4AwHU0HXwqtG7G7LW8DQI 7StdKsTtdpi1/DJL4AeNHw1sZNap8hKhqVjITX+XhML+9Byt5c9p93LwBcaKzD3yyEea pnB6COiiYvZMIk4otAUm2RYN/UTiHimlRD2crIFe3pp9aR9iHLhsKBjL52H5kVCfAPiN q+wryB5q8I9Oo5JiystXeoswQyR1bzuo+JIegvAOx5R+U1o8FF+A6c6hHkKLbWVKonbh IwYwkyxOjPxftCaIjYnV47GwSwfxDX8jr/nOy210DVDSj4YWBRKXA8Fv4/5uNWynTwvw 4n8g== X-Gm-Message-State: APjAAAVu22OJwn4xYN0rKJyC/D45BPqDdM1DowDXA0KytFXsqGeT1Fl6 hZ1GYoiLxzpDY5StK6A5UYs= X-Google-Smtp-Source: APXvYqyda+eb1yk1G8bZX6f6fvq6B3oBXpGgs/9ZNz9UzmH7poNpQA6/OcecUAP1K9MyxANBsK7VDQ== X-Received: by 2002:a17:906:5149:: with SMTP id s9mr48018196ejl.25.1555526224183; Wed, 17 Apr 2019 11:37:04 -0700 (PDT) Received: from archlinux-i9 ([2a01:4f9:2b:2b84::2]) by smtp.gmail.com with ESMTPSA id x55sm2251605edx.66.2019.04.17.11.37.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Apr 2019 11:37:03 -0700 (PDT) Date: Wed, 17 Apr 2019 11:37:01 -0700 From: Nathan Chancellor To: Greg Kroah-Hartman Cc: Sasha Levin , stable@vger.kernel.org, Alistair Strachan , Sami Tolvanen , Nick Desaulniers Subject: Re: LLD patches for x86_64 Message-ID: <20190417183701.GA2449@archlinux-i9> References: <20190411035143.GA14196@archlinux-i9> <20190417182457.GA5368@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190417182457.GA5368@kroah.com> 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 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