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 6C237C10F13 for ; Thu, 11 Apr 2019 14:25:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CA8C217F4 for ; Thu, 11 Apr 2019 14:25:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CmfJ/8Xa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726599AbfDKOZm (ORCPT ); Thu, 11 Apr 2019 10:25:42 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:35400 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726073AbfDKOZm (ORCPT ); Thu, 11 Apr 2019 10:25:42 -0400 Received: by mail-ed1-f65.google.com with SMTP id s39so5408832edb.2 for ; Thu, 11 Apr 2019 07:25: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=qTCE40LXkYgXJjE9GVyf4kyPH3ipOsuJv/MiIRhRTgk=; b=CmfJ/8XatR1OVY1I/eOWBRtUJY8oL6cGL6IRNQBLoRxM/jSgHugY0Ee7dtGSGuDF0G F3WMb+EjYmrjYCRyMaCwFoFj6dbYdu9AIWZRpYQBTPfNWFYpuMg1EY8diJOvxSRCpcZ9 e9MNc/mPwM+O/DUumVuliZ8BUUUwDo6QNA0H8DICWDnsdXyXXlsp4yu1UxCDiLh6wrHS d46jl2ixiQC91Eisqh8KR6S8JhyCvqscVNLECgjjsJtOir7zU8p29jpMyxQHQrvbvyKz U2ge13+evaYalxV7Pf1b8+zyXdB1UQ0D9g1u/V3fnt9eP3O3EGW05YxfAKUGlk6spqKC d51Q== 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=qTCE40LXkYgXJjE9GVyf4kyPH3ipOsuJv/MiIRhRTgk=; b=sWtpjZHyqmTWVJGtIIYC/mFJJxdpdIAhLN7F3ogCbzof1uUrY3WtSlqbjUEFgylPOe vq5FslYb1HBEIf7i/ejMlPo0GqYf/wfGO2brQjuCGSpMOhlV0NHeSg7HME8BdQpwHf39 S8wAiaWDQcP8+exUzcJMBHa/1qvod57i+gns2mskCfHDhUyYv2CIMtDf+ARuRCJbTDqN PPot4SYJ6wWe24E1YDFelkMz7jMVRXU2cjkdZeMnO9RhJlJtHa1oaMuUgmoumEqRvPLc 0VVZ3h1Tp+0UQGQd1dRVtmNzD7nepHClljJwaMbyZV4Cgbfn2VSanq02HFwDLTiEfRJP TwoA== X-Gm-Message-State: APjAAAWACB3MK44QMzY6yyaixUwVIkziNtZvvv7pUgI2BVlHn9VPU5GP PJDiM24Hi17cZM7gRGbGKxGguft2c/A= X-Google-Smtp-Source: APXvYqx7QZBvzrfcJ/we06y5huulULknarDkw7gEu25RftWJHfNj9Upxf3LXgv+wp+KaEY7MIlKuag== X-Received: by 2002:a05:6402:7da:: with SMTP id u26mr18511086edy.127.1554992740559; Thu, 11 Apr 2019 07:25:40 -0700 (PDT) Received: from archlinux-i9 ([2a01:4f9:2b:2b84::2]) by smtp.gmail.com with ESMTPSA id m6sm4396904eds.67.2019.04.11.07.25.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 11 Apr 2019 07:25:40 -0700 (PDT) Date: Thu, 11 Apr 2019 07:25:38 -0700 From: Nathan Chancellor To: Sasha Levin Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alistair Strachan , Sami Tolvanen , Nick Desaulniers Subject: Re: LLD patches for x86_64 Message-ID: <20190411142538.GA3455@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. (resending to drop the fat finger in the To line...) Thanks, Nathan > -- > Thanks, > Sasha