| Message ID | 20231027131137.3051da98@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp304073vqb;
Thu, 26 Oct 2023 19:12:01 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEz6L7XYBq6pwlut4Q4r1KbJPfMJ47RuboA9FPalsng/IwUPYYXPZ5EGqhn7pg+tXRjTqUH
X-Received: by 2002:a81:e70b:0:b0:5a1:db6a:6459 with SMTP id
x11-20020a81e70b000000b005a1db6a6459mr1243469ywl.40.1698372721032;
Thu, 26 Oct 2023 19:12:01 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1698372721; cv=none;
d=google.com; s=arc-20160816;
b=HTVdCHLAPz5AJOYSckI4xlc6RhscrueSI/VHxhXmXhjumqBFmLREf9ewXJ5qyckHOD
LYX0zsEaEo0+fiT+TEU6ioeYmZxhPcEGfAwv5kED9TtR4DJiDVpFX04CBGQ2Ygxj9BHX
hUGL3rQ8rAPQF5OErhfQqhPrMHwVbf5Bs2m+sBIBNb2btE1dhBro6iQx3ptixJNZtF5r
vBS8ksc4XAWWD7GhlzcOVBgnDLJN+mTmQ4pY4ciFWE6KX8GmOFRxpAPxbuUQTGDJ+U9p
RZaGh2WvNLEYallgjyVDaoMSExVuU74QhkPHmlIYFA/CXR3PbonDyWdd33cL0XKbjpcS
mTrA==
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=L78u6ap4IGUMhTaeDopMfUlGi1+u64G74GttUwfHGC4=;
fh=9npp+0j/8bllWjzeQYJ+YsOYf5EhbMM/2fv4/y8BIrE=;
b=MlsGNQrQShynYVY2PcdylTZbHytZq7hMKW3DeFX6RtIwKu8fRB7W4rEHtxKAnVAeG5
n5dpzGKYBw7Hm512l9bRen+4c4TBKmdjYokmobhnY74H8syXeMAFqauMBFhXg1I8C4ZK
eH3BJUKWekpMFxznfb3GP6mhdYysl8bzzMIOfLXGcwMYNWcCRFEKhmXJOGQQ5uowgRZk
OYMcr8wGB7btkotYvCJqsqYZUIJNTZ+NtmUaLHDkDuvWbn6TeUQbHxSlSTQz+t9fN9Ck
4EcAdW46/smHuWYWE4vBnVZka7DG4EBAkTC0Mbso4Cnf4G3A2cvLJwCQu+Hl7BJcfO7Y
Qx2Q==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pspNjo0V;
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
z16-20020a81a250000000b005a7b918c656si945724ywg.168.2023.10.26.19.12.00
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 26 Oct 2023 19:12:01 -0700 (PDT)
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=pspNjo0V;
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 214028087278;
Thu, 26 Oct 2023 19:11:54 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1345145AbjJ0CLo (ORCPT <rfc822;aposhian.dev@gmail.com>
+ 26 others); Thu, 26 Oct 2023 22:11:44 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50660 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229437AbjJ0CLm (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 26 Oct 2023 22:11:42 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42365187;
Thu, 26 Oct 2023 19:11:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1698372698;
bh=L78u6ap4IGUMhTaeDopMfUlGi1+u64G74GttUwfHGC4=;
h=Date:From:To:Cc:Subject:From;
b=pspNjo0VUBXf1sFlBOxDrYRzea7YBDPoy7qWhgjrR/z36gEIGu9yENhTrmNvFDbOH
R8+QYPHO3wb1cFwt4tbldu3A4Ab7SoYU9D5gpkgRzb2Oy+f1Lgh6p9ky7CA/RFmqw7
ayOZQtIGYoVDWYH1eubptW/NJEKw0jxRFjAyoxIyuDKreLRA4g850ztGRVvvZu7qJ7
YBej6iKRha2ysxEmqeWqS2dk05TSo37M/QI+uIk0t+Aca+QfCy9mHClhaQz51KaYda
AAb12n3GVaxrazWpy7PLGxCmHhahc0xpDPdtqSydCcIDyqbEB6ncSDgAmtfSe4Th90
cuTi8UzgY1Gdg==
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 4SGmPQ1P7jz4wbh;
Fri, 27 Oct 2023 13:11:37 +1100 (AEDT)
Date: Fri, 27 Oct 2023 13:11:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
Christian Brauner <brauner@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mimi Zohar <zohar@linux.ibm.com>
Subject: linux-next: manual merge of the integrity tree with the vfs-brauner
tree
Message-ID: <20231027131137.3051da98@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/TDUVDSA/+dZm.nsderLExk6";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS 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]);
Thu, 26 Oct 2023 19:11:54 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780872874417470128
X-GMAIL-MSGID: 1780872874417470128
|
| Series |
linux-next: manual merge of the integrity tree with the vfs-brauner tree
|
|
Commit Message
Stephen Rothwell
Oct. 27, 2023, 2:11 a.m. UTC
Hi all,
Today's linux-next merge of the integrity tree got a conflict in:
fs/overlayfs/super.c
between commit:
2bc5e5e8167f ("ovl: rely on SB_I_NOUMASK")
from the vfs-brauner tree and commit:
bc4532e9cd3b ("ima: detect changes to the backing overlay file")
from the integrity 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 fs/overlayfs/super.c index 1a95ee237fa9,c71d185980c0..000000000000 --- a/fs/overlayfs/super.c