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 E1089C10F13 for ; Thu, 11 Apr 2019 14:21:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A79CC217F4 for ; Thu, 11 Apr 2019 14:21:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QYlT55g1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726391AbfDKOVn (ORCPT ); Thu, 11 Apr 2019 10:21:43 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:40568 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfDKOVn (ORCPT ); Thu, 11 Apr 2019 10:21:43 -0400 Received: by mail-ed1-f67.google.com with SMTP id d46so577314eda.7 for ; Thu, 11 Apr 2019 07:21:41 -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=2o6U2k7PVmH4l14HjyuK3vF55R3xJMSHnvcULaBjnfU=; b=QYlT55g16oinUlH4RfQODdou7v6z/H7L15UffBdmJr1rwJTbglyT7ZCNiIY1i6Rkie TaIPeb/iShM31T4nXNYqfYz8fEVz/uYVOkBLMsxX7h/6CDRhV2GOOldDZZAeGZS3aO8/ HiSKx84S9v7Ri9WOAkeK5BpxZ2PRnxQsiWgg0I5mxU9HCHEYU5f6/kv1Q+k10+PVoiuu 4LcaWZNefpgIdMZoKbH8lbBWQuzo4i/BPilf4US/JFiiohlcej/5lqZ0czkgRKaTCwJN YnJnccxfnz/AZNLAbmJumu659gfCZ9khUSSOWh0dT3q5ynU7aWhRgIy+jqarV06irE7B HwEA== 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=2o6U2k7PVmH4l14HjyuK3vF55R3xJMSHnvcULaBjnfU=; b=IHiOKpKTBikFX0DlgmDGweKiT1eQ1Or4KM+Nn4pWfTQHNGxEPU77vJUshHIKDWWlxr n88hQw8ESu6vCBRsYlJpcqUFJMfMk5tb7t+fk3+MIJcDwcS3zynQ+FZPUZHHS6Clv/jW edS37okCI4v0hUcrcnNdzWD13OZpUx71TFWm88Z3Y1eA3BL8j7F6x6izRPaNiETNQjHw M/8MnxSZ6oeYrRioA/zNkL2FaqyVvWLEof3Rw0tRJtd+a2ReD0lsE39ztpHtMbQN7P+x VgLldS1LyMfEAiwm5cMVTLkDkK5t2JwEbuBDSuMDe6hYxhp+sBKt3KPUpM5KSkNoYY4D SoMw== X-Gm-Message-State: APjAAAXxZpvvzlIMFLsgUw39Vglb2GVrSA/tvogQlgqJSU0JhwF7qhH8 dJ67CWJBGOII/SvWTcX7D34= X-Google-Smtp-Source: APXvYqxPxwIQ045P0qJKWapPXRj/9dnnZC0AnFgBwEov/uW7ksxXZGrq/GRJTTkAsIgNmTj5JojVgg== X-Received: by 2002:aa7:d819:: with SMTP id v25mr29542947edq.70.1554992501057; Thu, 11 Apr 2019 07:21:41 -0700 (PDT) Received: from archlinux-i9 ([2a01:4f9:2b:2b84::2]) by smtp.gmail.com with ESMTPSA id x18sm1919427ejd.66.2019.04.11.07.21.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 11 Apr 2019 07:21:40 -0700 (PDT) Date: Thu, 11 Apr 2019 07:21:38 -0700 From: Nathan Chancellor To: Sasha Levin , g@archlinux-i9 Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alistair Strachan , Sami Tolvanen , Nick Desaulniers Subject: Re: LLD patches for x86_64 Message-ID: <20190411142138.GA3364@archlinux-i9> References: <20190411035143.GA14196@archlinux-i9> <20190411135804.GI11568@sasha-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190411135804.GI11568@sasha-vm> 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 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. Thanks, Nathan > -- > Thanks, > Sasha