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=-9.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2FB89C433DB for ; Sat, 9 Jan 2021 17:05:53 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4BFA23372 for ; Sat, 9 Jan 2021 17:05:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4BFA23372 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/40uu1vZkw82v0f+/KZqZ6IUXFhL3QT+Am0Xht9lW1w=; b=XAQGdhfuTWl56FcpWFWI4Y/Ks AxEzkNKrN0ctQ8fawGp4xWTpdlwBrJI4qRjSQdvHb7XUtkQzsT6WIGZeqGW0OjAVrWQZirQyMC3My HMFWtLMFWEqwse8Zvevf96SY2PRGFElsmGc1opfyXX2GXKlce4HvoxA0n6WVoPOgFR/EhmuLKZSiD tRp1yMd75XfPN6Ht3deYK+3ZyW1YpMpNSTvMiYYYbFKQxGn4He/Ip2rlia5g3zksvdUNvY8xDonHj nn0IJtLtiTO68NPy9QqGKcnIr88O+j7yosIiSCJo5c3auQ4eR902CkP9sJfkM6rfvzEcF4ctCnwf5 nW+u/Ru4Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyHer-0000km-3z; Sat, 09 Jan 2021 17:04:09 +0000 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyHen-0000jN-CM for linux-arm-kernel@lists.infradead.org; Sat, 09 Jan 2021 17:04:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610211844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lgv0MtjN+q9SruMJbKaoUMIuZ7zzQ7Hn/3LTwFUpEAE=; b=VMGs2EUMZ1nrYKcKnSEflbe2BuaRcR9AeQhZWy7WmbHgjUuxqHZMdY3mUVYKnJlMJN0oym iqww3OQJVedugeVnn7AUSNxnSR7IPXvy7pO8MmzwfkQe5bQEOnIKAVi9a4sHIj+tPUxXUd d5NCbstV3pJo86MEN+M3UYbfxMvQTfk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-514-RgalnBNRPTCReKRWkgJQQQ-1; Sat, 09 Jan 2021 12:04:00 -0500 X-MC-Unique: RgalnBNRPTCReKRWkgJQQQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1B4B15720; Sat, 9 Jan 2021 17:03:57 +0000 (UTC) Received: from treble (ovpn-120-156.rdu2.redhat.com [10.10.120.156]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E32D5C1C5; Sat, 9 Jan 2021 17:03:55 +0000 (UTC) Date: Sat, 9 Jan 2021 11:03:53 -0600 From: Josh Poimboeuf To: Sedat Dilek Subject: Re: [PATCH v9 00/16] Add support for Clang LTO Message-ID: <20210109170353.litivfvc4zotnimv@treble> References: <20201211184633.3213045-1-samitolvanen@google.com> <20210109153646.zrmglpvr27f5zd7m@treble> <20210109160709.kqqpf64klflajarl@treble> <20210109163256.3sv3wbgrshbj72ik@treble> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210109_120405_684683_B6554485 X-CRM114-Status: GOOD ( 13.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Kees Cook , "Paul E. McKenney" , kernel-hardening@lists.openwall.com, Peter Zijlstra , Greg Kroah-Hartman , Masahiro Yamada , linux-kbuild@vger.kernel.org, Nick Desaulniers , linux-kernel@vger.kernel.org, Steven Rostedt , Clang-Built-Linux ML , Sami Tolvanen , linux-pci@vger.kernel.org, Will Deacon , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Jan 09, 2021 at 05:45:47PM +0100, Sedat Dilek wrote: > I tried merging with clang-cfi Git which is based on Linux v5.11-rc2+ > with a lot of merge conflicts. > > Did you try on top of cfi-10 Git tag which is based on Linux v5.10? > > Whatever you successfully did... Can you give me a step-by-step instruction? Oops, my bad. My last three commits (which I just added) do conflict. Sorry for the confusion. Just drop my last three commits: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git objtool-vmlinux git checkout -B tmp FETCH_HEAD git reset --hard HEAD~~~ git fetch https://github.com/samitolvanen/linux clang-lto git rebase --onto FETCH_HEAD 79881bfc57be -- Josh _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel