| Message ID | 20231211151303.1286eda5@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6823677vqy;
Sun, 10 Dec 2023 20:13:18 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IHiDkRZExuRyE7blmwXYGq+YKeeJhOxFzCbiy3sDMTkMD1Q7GOC5gz6znDZbhR3nusmtgqf
X-Received: by 2002:a05:6358:2921:b0:16e:271d:1db7 with SMTP id
y33-20020a056358292100b0016e271d1db7mr2377030rwb.2.1702267998009;
Sun, 10 Dec 2023 20:13:18 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702267997; cv=none;
d=google.com; s=arc-20160816;
b=hleaMeBsay33emfGhvMdEEhyps3KQ56z6oOeBO7TtZU4YvJ3HVxbJDoCFfWXY2f1j+
iGLuhbY5PsHpuBBLgtiPEBQ1cfZ3NVZJsEtoFTyAEQzB5i8uDXcO7OQnkAoGNNlFga0K
hRgSZga0CTZY/476fZSHGx9yImMXwx7+E9vgdMo0ceipY6vHqTItVJxr7oNUbR+EIvFU
SAYGQX8IHeJdQRN2DO8khx1OxOw66o4nN5ENkvrwsr6zzTjvP6/8Hz9VcDvkE+NYbMD9
QZ8s5YqM4RCCp9shukZnAZl+xeDWoqGXQSdHckMMUwmwPtxcbZjfi+N14Tz0T58UnlTy
1kXA==
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=QmJBFR8Jd+l7wvhUpTwUIIFEUSssE1k1dZ/vixNT+wE=;
fh=cppoaBJAS+/8nj2jatLe+h80McwfXI7KzZBOzg2WIaU=;
b=RoabtxYc0Gaf6H+ciKEGR3hCkHyRZpl4tbi3QjCbOYgVl3w87Lyty2lFNrXk88NTri
xto4ipVYdvgHgmWr7Q0VLlTy0vyYkyegrP8I0P4PIbQR6fGv4oRxe4Cqc099R9TFYs2m
nyAAMGIbrnRT2rATc5zjZ3/jPm84drH4za2QXPPEiCZf8pwmnbwA9e9wQiLS7H17kb+k
MmF1LGrvI6L7Tg9EjCslvVr4TP84GP23wqQG7GvaJcW1lEtHW5SI2uq/AtIfLak6z05Q
UFMbSW3RQFF5AJjqjL2TId+HTbNksUffVWqVMXiW3J7iDmrUNUeyZR8DNB8X8lB6CbUP
VGiw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=N2CkGRsS;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33])
by mx.google.com with ESMTPS id
q7-20020a17090a2dc700b00286b6bfe6dcsi6813257pjm.0.2023.12.10.20.13.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Dec 2023 20:13:17 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=N2CkGRsS;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0])
by lipwig.vger.email (Postfix) with ESMTP id 8961C80697CF;
Sun, 10 Dec 2023 20:13:15 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229757AbjLKENB (ORCPT <rfc822;dexuan.linux@gmail.com>
+ 99 others); Sun, 10 Dec 2023 23:13:01 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40068 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229448AbjLKENB (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 10 Dec 2023 23:13:01 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15765B5;
Sun, 10 Dec 2023 20:13:05 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702267984;
bh=QmJBFR8Jd+l7wvhUpTwUIIFEUSssE1k1dZ/vixNT+wE=;
h=Date:From:To:Cc:Subject:From;
b=N2CkGRsSE/qUgDp+YeYV1FrERCqJeMw3ceJKiB8dtpJhblREm48Y9XlsCkad2R2RI
ftFiaQbZGUZuyexxOAWG/PTE9PeFuYp/7esjIdaWK25iFeevi64PU6Y3R9obS+GrPw
elnOmLdf2ZcsGfV042Wdt+YbbbHHZY/IdkcU5HHquZIwXF8QU4Qy8Ypetvc1On1JWe
XSID5b6EoAWMkATdU5eN6e/vLWte0Kn3o5nDxD52zgArYAbhH2fp/v8VQLhiROm5wU
aJbdwl5fOU/FmKtEfh9Edp1i4/NfFn3dI+p06RtVd7CxEBm2zadsrJWgNpu6+ON7le
Ea3/rRW0JUg2w==
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 X25519 server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4SpSym3fJdz4xCm;
Mon, 11 Dec 2023 15:13:04 +1100 (AEDT)
Date: Mon, 11 Dec 2023 15:13:03 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: 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: <20231211151303.1286eda5@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yo8XSFAKhlr3OmIsAQtWar4";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]);
Sun, 10 Dec 2023 20:13:15 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784957368107551279
X-GMAIL-MSGID: 1784957368107551279
|
| Series |
linux-next: manual merge of the efi tree with the efi-fixes tree
|
|
Commit Message
Stephen Rothwell
Dec. 11, 2023, 4:13 a.m. UTC
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
fs/efivarfs/super.c
between commits:
0b6d38bdd6f8 ("efivarfs: Free s_fs_info on unmount")
ab5c4251a009 ("efivarfs: Move efivarfs list into superblock s_fs_info")
from the efi-fixes tree and commit:
b501d5b36f58 ("efivarfs: automatically update super block flag")
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.
Comments
Hi all, On Mon, 11 Dec 2023 15:13:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the efi tree got a conflict in: > > fs/efivarfs/super.c > > between commits: > > 0b6d38bdd6f8 ("efivarfs: Free s_fs_info on unmount") > ab5c4251a009 ("efivarfs: Move efivarfs list into superblock s_fs_info") > > from the efi-fixes tree and commit: > > b501d5b36f58 ("efivarfs: automatically update super block flag") > > 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. Actually the below is needed. ("info" is not a great name for, even a static, global variable. And maybe what I have called "einfo" could be "sfi" like in efivarfs_kill_sb() ...)
On Mon, 11 Dec 2023 at 05:39, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > On Mon, 11 Dec 2023 15:13:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > Today's linux-next merge of the efi tree got a conflict in: > > > > fs/efivarfs/super.c > > > > between commits: > > > > 0b6d38bdd6f8 ("efivarfs: Free s_fs_info on unmount") > > ab5c4251a009 ("efivarfs: Move efivarfs list into superblock s_fs_info") > > > > from the efi-fixes tree and commit: > > > > b501d5b36f58 ("efivarfs: automatically update super block flag") > > > > 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. > > Actually the below is needed. ("info" is not a great name for, even a > static, global variable. And maybe what I have called "einfo" could be > "sfi" like in efivarfs_kill_sb() ...) Apologies, I should have spotted this myself. I'll fix this up and sync up the branches so any conflicts are resolved before they reach you.
diff --cc fs/efivarfs/super.c index d7d9a3e189a0,42eff5ac7ab4..000000000000 --- a/fs/efivarfs/super.c