| Message ID | 20230530143217.49ae8cbf@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1933493vqr;
Mon, 29 May 2023 21:47:06 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ7skfOaGZmeDfV2wRUypUl4DUfONjLsWwSfkGCfriQ1ZtrsShoZK1ZARvj9jYH5Q/g7pnQl
X-Received: by 2002:a17:902:d2d0:b0:1a9:90bc:c3c6 with SMTP id
n16-20020a170902d2d000b001a990bcc3c6mr1314214plc.16.1685422025533;
Mon, 29 May 2023 21:47:05 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1685422025; cv=none;
d=google.com; s=arc-20160816;
b=jZjHRKPu5kisLnxq1Ang0QCSejlAYfKLu0hxM3Slkle5vJtuxRRprPWRUfP2TnTpzO
DhuzN3kYnZXs++k8M9WBzsYmZKaVTAlxIMHddyB/jp0Ko8X8BuFWsrfktL2HVBk6Z9cd
b/lAcJpIhRMf7rpRUM2u+/KxpYAUmIeQjrVIxEJ9l48DqEZEFpuqJr3EMi9Qm87/kYPG
BzTzF0PYV2B6k/5B2GUB+uZ6CehRRcOO4Wu9v6EQjdIn87H2RzvNzwr48yA193Kt9kN5
RoE6Oz9TCSo6SaiGhRuYuAJsTYaY/htShtZFZiMbVvFHvhYhmd3ULaL72UUAHK6HI+Nu
3YqA==
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=U8n9Hde3DsbVeXiazBuQ1xk7QSZyvg9RTkdEpTMUxzc=;
b=p5weOz71F4O0PhU/RZVqnBsk0836AquEE/zs99LuCRO0+kC+1MKbewq5UVnPKHVHe2
zNod/swv+tZMCuhv/ElVzVsnZaSgMndiqBibPvtoZs7CfhHCo268SiUfc4wmDT1k34MD
QDfggZny//OEzSF0/TwANpLTPQo5elfwhFli/3SPQ1oYNe7kzXH8oGpEo7ybI4arTDdo
vLrD0javH7PViFVP8mjdwzHXyqTDmdTpeOXIGKzbCHUbzebZ+SFW2g6bsRGxtCPXdGHF
Oju06beaxDKBoUVorM0ZyrJZP6hpuBI6JpCp6WBwJfkVyd2ziUmwQVeREzu25wj5RKSe
RiYQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="KhxG2/lu";
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
h10-20020a170902f54a00b001aada12d628si10626672plf.585.2023.05.29.21.46.52;
Mon, 29 May 2023 21:47:05 -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="KhxG2/lu";
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 S229912AbjE3EcY (ORCPT <rfc822;andrewvogler123@gmail.com>
+ 99 others); Tue, 30 May 2023 00:32:24 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58476 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229838AbjE3EcV (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 30 May 2023 00:32:21 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0162BE4;
Mon, 29 May 2023 21:32:19 -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 4QVfcy0Q97z4x46;
Tue, 30 May 2023 14:32:18 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1685421138;
bh=U8n9Hde3DsbVeXiazBuQ1xk7QSZyvg9RTkdEpTMUxzc=;
h=Date:From:To:Cc:Subject:From;
b=KhxG2/lu2ZYmaTaJApux+GzhYtZ4KdSpq/UwExYHeG43xweeYGftLEhUfKJjMKkJp
T+gC8iydc+wqBmxtlb/ikNIAtD7FWtlR5zVXwkUmRbCLWbb+Hvk4GO2GujXPzqfn7i
RL8gZaO/VrcJ6eeGj1mkHPaW2beTuU9xXfJq+uVsRuvT7kGWNSVqGWbfU2DfHbFKGl
0/LQDsGWXBT5ks75B5tbRPG67YKzDaWxHxWphSlbbsQOFfDW6cjAH3uoimts6+YStB
b4a7wKbuoqzVUYMWve9JXyv0ILM3wfeCLJajqFTaMO3oRebXYKE3Jq1SIWfQKRJLt/
fSzLnLskVs+gQ==
Date: Tue, 30 May 2023 14:32:17 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Masahisa Kojima <masahisa.kojima@linaro.org>
Subject: linux-next: manual merge of the efi tree with the efi-fixes tree
Message-ID: <20230530143217.49ae8cbf@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Zta=SjlqHVMyuVoNmM/m3i1";
protocol="application/pgp-signature"; micalg=pgp-sha256
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1767293085656606854?=
X-GMAIL-MSGID: =?utf-8?q?1767293085656606854?=
|
| Series |
linux-next: manual merge of the efi tree with the efi-fixes tree
|
|
Commit Message
Stephen Rothwell
May 30, 2023, 4:32 a.m. UTC
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
include/linux/efi.h
between commit:
fd936fd8ac10 ("efi: fix missing prototype warnings")
from the efi-fixes tree and commit:
5b6e3aa08c62 ("efi: expose efivar generic ops register function")
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 include/linux/efi.h index 571d1a6e1b74,657f7e203374..000000000000 --- a/include/linux/efi.h