From patchwork Wed Jun 7 02:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 104210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3816724vqr; Tue, 6 Jun 2023 20:09:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6oTZ3GsQ+WarmXcOof0ZLWVF2PsDOmO2DQAG5RR4Q81tnnbcTrmIqu0pgXmWaWmcn7yI08 X-Received: by 2002:a17:902:e811:b0:1b2:4042:d227 with SMTP id u17-20020a170902e81100b001b24042d227mr2970247plg.12.1686107359421; Tue, 06 Jun 2023 20:09:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686107359; cv=none; d=google.com; s=arc-20160816; b=ykV98mNh/62YbYfIZVB7AEtSZoY+Ll5x70XD5a2COIAq+8LJPYTH1czSyTUa9CuQes 6we7i7ur8tC9vSFnm5Z9z5/Bf+O3eTAW/xndBBvYnv3P2z5TuL/+79A5MeGkCIz5efZp dhwBnp2ufwak23SzdUac0vOT3jCaIf5MqiF9DeynIhHbrd5bPK3KuNiVblu+VA/5bWdu qgGD+rD6TiZr8FIpqpX1K2r0MC6VW8ItVUA+s2itA0gf3q43XKAPJ5Z3IpOAUob1JK7X +E+Tx256o9W8Jujo04jdd4VHMvd0NOBvc1QT5F75pt1SFkj0jep7Fgx7lyLh7snHNERM d7nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=/YH5S+2AJFFJq1Hrsg9tO/GOXSqnBHuWYm5WM+dRDo8=; b=GvqIcWA/p71PEVTSAjTrhjJl+deW/6RUHb1ojCEgDcIYLyBEq2KYyj4rXXtQKoPUEI Kpa0EdaGxhOGTqVU0tpvbVptY3j/NTSa2rcDvwUYIO9JLioKETEB2zebIi7a5+d47yFP NiBbEfhCbrJYv01To3GUbCTETOxaD3YVHT6VmDt3+uwO2gkbg3q+iRfkAk/WCNhd3nRF HCuopGrBaExVdFy/G2oDCbv1pBPXTH2PfkBS5aJpAr9i1Cdwwl6s2V28B+5JZXFh8slK tmsLElCLCeTmnickyOkXT+NYMXtUXqs8jHVoxgJorBSwYCAFJtYVpMKfWeoT/2iX/PP4 qXVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Dds5m81z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v71-20020a63894a000000b00542c0357ee6si7173619pgd.814.2023.06.06.20.09.06; Tue, 06 Jun 2023 20:09:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Dds5m81z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240696AbjFGCIa (ORCPT + 99 others); Tue, 6 Jun 2023 22:08:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240671AbjFGCI1 (ORCPT ); Tue, 6 Jun 2023 22:08:27 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30B9E19AB; Tue, 6 Jun 2023 19:08:25 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QbW3469GWz4x3g; Wed, 7 Jun 2023 12:08:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686103698; bh=/YH5S+2AJFFJq1Hrsg9tO/GOXSqnBHuWYm5WM+dRDo8=; h=Date:From:To:Cc:Subject:From; b=Dds5m81zIBe8t49fDwqXx9JPjUyrv5mDCmHvUHgOtZz6dE+RDO7hHqxqPHKJwj+8s jJ7jaP+c9WbMaHyhWHxXk+Ino8uzM1HRgjy2nnshk8wa1SwomueoHwBM4ROrfjSR7e RDTms7AoWTfc8LFcLwOf56AOUJbuB7mkeJCO/p9bXuJ4rn1OHnoRBiIKTO8v1jvDZs bT02NdxpQHu5+qukPXyXdBPQUKWVwvNTFKKxF4aq6Yum/ol6bePQ20xd99UsuNLLzw Wjym38qKmAVPZWAcyjwbVs2Lda8pUFI/5zBXsY3nNS5RknZpPh3nA2d0Y8IUldgPTn 4QsuIWhvzsHqQ== Date: Wed, 7 Jun 2023 12:08:15 +1000 From: Stephen Rothwell To: Ard Biesheuvel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: "Borislav Petkov (AMD)" , Ilias Apalodimas , "Kirill A. Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List , Masahisa Kojima Subject: linux-next: manual merge of the efi tree with the tip tree Message-ID: <20230607120815.7b569f57@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768011710850923472?= X-GMAIL-MSGID: =?utf-8?q?1768011710850923472?= Hi all, Today's linux-next merge of the efi tree got a conflict in: drivers/firmware/efi/Makefile between commit: 2053bc57f367 ("efi: Add unaccepted memory support") from the tip tree and commit: 39c90699b330 ("efi: Add tee-based EFI variable driver") from the efi tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/firmware/efi/Makefile index e489fefd23da,2ca8ee6ab490..000000000000 --- a/drivers/firmware/efi/Makefile