| Message ID | 20230803112830.21c805a7@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp889040vqx;
Wed, 2 Aug 2023 20:44:36 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlGpYmnzgg7WuB+42bF/aRq2ee2928UZKiBZdXCs2I0WT9X6Ig8n0L5aAc2ZfGAxrntGzCES
X-Received: by 2002:a17:906:74d9:b0:993:eed1:8f0 with SMTP id
z25-20020a17090674d900b00993eed108f0mr12791620ejl.3.1691034275720;
Wed, 02 Aug 2023 20:44:35 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691034275; cv=none;
d=google.com; s=arc-20160816;
b=XFG1jQobtIS+uthYYE209bIKOkAfa6HnZY2HQp3QYMPFEV+z71qgklu04YIJwtn8Kp
RACJUF3XAwPsye4wQXlsFBGJgZIt/0OUDUlZnFIajrfSiBq4mF83cL2jEJjjYkf5R3rV
+tE5PfZJ/PB7x5U4MDQrsxOkaputuazIyvgft0uJ2jIYTqw4Fed8F+p0BFz6iYyxYCcl
5iC7WGzzsUCl/7UMf+lSkneFAn/bO3HyTSqtnctFWrMgSOuic9qSgvYFGePJqcEo6PsB
r3g4OnvlbFIvy8tWJp0uGTbJIPqf5wrV6zgSTZYBLPmBSQ5ThcZHWODHtJ9eE98Muafw
4oew==
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=zzUxoMrW0h/cLUqTaqtv4wQNJt5GODwlXy3Re2dpgPc=;
fh=PxbYyQcZrrFadThh9gQ5q0/7a78YbtyqzIwgLxzjaME=;
b=ZKx5i9B4QERLK8MmRLWErzIjRTgElBwPIOW20e/VmYnOYVrP4Pdgi3JG/5QXdIgcue
GCODWf51RWIOzuaMa/s21Dm7U28mrGwVk3/vskvfv7gKAO0IYcZS7fyGNgbhXDhcBhvL
8366m+O81nfWLKEIjkBuz93rcIaCd0s5K/WmSf68iZJ/79HV9CDBFilzBQ3vMshhu2ln
/t7IgYG/HwGRTVzcELDfwfQITOXCRfXM6vqLHuuhCVgyH21Wv0YNB5O8P0PKQ3m0+u5G
OjJRFfDG0Jp/XTnZZCPLkBKqobM5oyLAsUaqdsZwCLzvGest0QHZkxcpLhpKuu5MuxZE
5xIw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=OJXBlizE;
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
z4-20020a170906944400b0099b8b1d54b3si11611754ejx.432.2023.08.02.20.44.09;
Wed, 02 Aug 2023 20:44:35 -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=OJXBlizE;
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 S232013AbjHCB2t (ORCPT <rfc822;cambridge8321@gmail.com>
+ 99 others); Wed, 2 Aug 2023 21:28:49 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54468 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231869AbjHCB2p (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 2 Aug 2023 21:28:45 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D2C530CA;
Wed, 2 Aug 2023 18:28:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1691026112;
bh=zzUxoMrW0h/cLUqTaqtv4wQNJt5GODwlXy3Re2dpgPc=;
h=Date:From:To:Cc:Subject:From;
b=OJXBlizEuP1aN95mUTkyeZ3TZookzhjNn5qkwNwEMkXkEDuo7erl1qm0H1Rf9Be8f
d9xCqL3LZIRI+RcKazK0UkeOSlJj6KL2uEQYmbR/P8b9MFhwXWYXqvJSm3Ej1AB7+s
f3SrdLY2c5fi0odTVh9ONFSxdlEDvZsdBG5cibJUOzvdKh12B1peL+NtlkJZYjThiL
bpGDWWsQIFkicKMBTHMLvQ3ser3auUzx3WKsptRxerJrpdEpPl/whR/3W1iVjfnCjj
uajlzadEBFffJtCpbjhTcxNVBtVpo4eJD4Ml6nbQtdxcgDTQdhOWZ2HInXv5VHCaTC
Ra0TEpflkLj0A==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4RGWSw52zcz4wbj;
Thu, 3 Aug 2023 11:28:31 +1000 (AEST)
Date: Thu, 3 Aug 2023 11:28:30 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, "Darrick J. Wong" <djwong@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the block tree with the djw-vfs tree
Message-ID: <20230803112830.21c805a7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Buv3IITV=ap.THZsaND54hy";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
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: INBOX
X-GMAIL-THRID: 1773177115626770645
X-GMAIL-MSGID: 1773177956625973766
|
| Series |
linux-next: manual merge of the block tree with the djw-vfs tree
|
|
Commit Message
Stephen Rothwell
Aug. 3, 2023, 1:28 a.m. UTC
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/super.c
between commit:
880b9577855e ("fs: distinguish between user initiated freeze and kernel initiated freeze")
from the djw-vfs tree and commit:
4a8b719f95c0 ("fs: remove emergency_thaw_bdev")
from the block 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/super.c index edc588bca7fc,bc666e7ee1a9..000000000000 --- a/fs/super.c