| Message ID | 20231220104110.56ae9b36@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-6106-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2305184dyi;
Tue, 19 Dec 2023 15:41:32 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IHT3IhopSLdrWGiLB0f9OAeza1TqCpRF3miZ3FXaZ+a4kJC+NNQ1CyzIyLf2yZti/H7lc2W
X-Received: by 2002:a05:622a:1043:b0:425:4043:8d2f with SMTP id
f3-20020a05622a104300b0042540438d2fmr17423848qte.74.1703029292430;
Tue, 19 Dec 2023 15:41:32 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1703029292; cv=none;
d=google.com; s=arc-20160816;
b=zRK7sxu72EnjU1uXXNVsmZ3vkOEZJ2RXyaokGddBNaXelbYCI2nbY2yz4IgKwl2H1u
88SBfjr81KQOlPcgY0GvyRSaMuw2ByHMrkEVXH0nG3jXk10qfgfsogDM89+aHZRqFm0H
geuRCzJB8wZYQaJMAM8d5xbFiX6irw/AQ99MelbSDi3nmTPizieoqt7ohdTy0kk7F93z
nXS7qtAuvdvQLiVEqOrNB9hiM6UYQI0kEfIpD0jjvHA42BDjodTQBU2OWVt00gQPcjoY
uEM5UZwrBGQhsOYmoNXjk+0AlSXQolgDQx8RX/Wj09xMVaXzgSB9NsoCFK84c97V1H3t
pwmg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=Dcfd4RhAnXHoe7RYkF8n8Xk/9I2NneoLq8kj1SwTKMY=;
fh=O9Cflmu/gIQKP/inkzpahgM2D7MUdW/uFxDtnEi/mW4=;
b=Z8edUxpRjYeyJz06yJLpelTk86TEOgRgYaunYfFep12pyIDi1j7Bi01oFZYihIGRbZ
d1WwZGfhUv7eN7AcXHrV4TzETM3ZIs279gnk4V0hvoOdAoylytbmpfFxb2jNiQMHNGTr
aGC51nB9F7hMmOwmDH0jaieNZPokkjUes5VILnOKJyNhXMzNjFaPda0ncq5FpCYrfiNk
PxoASfw9JmwSrEDJd0z1669Ql6wKTV4qC0awU+mjJdBQ9yvMAZC/pplSFIj51TuijfvP
N08u63cbSvYTJugplivHcVTZnAAGVkYXKvb/UlgH68Zb4YcqNsMUwsXc+pfm9ucopw47
J6hw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lyKmhNFA;
spf=pass (google.com: domain of
linux-kernel+bounces-6106-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-6106-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org.
[2604:1380:45d1:ec00::1])
by mx.google.com with ESMTPS id
22-20020ac84e96000000b004278776962asi193112qtp.271.2023.12.19.15.41.32
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 Dec 2023 15:41:32 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-6106-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lyKmhNFA;
spf=pass (google.com: domain of
linux-kernel+bounces-6106-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-6106-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2995B1C250D4
for <ouuuleilei@gmail.com>; Tue, 19 Dec 2023 23:41:32 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 05941405EF;
Tue, 19 Dec 2023 23:41:21 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="lyKmhNFA"
X-Original-To: linux-kernel@vger.kernel.org
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 986C43FB0B;
Tue, 19 Dec 2023 23:41:14 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1703029272;
bh=Dcfd4RhAnXHoe7RYkF8n8Xk/9I2NneoLq8kj1SwTKMY=;
h=Date:From:To:Cc:Subject:From;
b=lyKmhNFA1/A1sH9hS0wM1eWuKU0ZQMVFUgPS2DlAXeKjsIKuMFI9ZmI+a23XMl5Gw
B8cdNWJCvhPE1qDip2CwzxgVmikC+Goetpdt5sJRxSPNR1r0AZAI6kPcM089VHfUTO
ZRj31MPXd2LB3u3wU7QO/RYqZdpqmsbKH6eoOgdfOmMAJimZoBC7mK3CZvq1xRIc6/
XxPIY+HqiywFUhPmYeHLK9tVW8/A7EEhvp9ndvX8qR4zUVxJGnjvkQoShRRh1kKnNh
9ipqa5pw8tLxRKQhqa8aGrhofRYrsFmwEgFVmzJqUkH9CngTUvMFIpL1WpIzr/MORG
GeOeWiB3LK9Ww==
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 4SvtVw2W0Wz4wdF;
Wed, 20 Dec 2023 10:41:12 +1100 (AEDT)
Date: Wed, 20 Dec 2023 10:41:10 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Christian Brauner
<brauner@kernel.org>
Cc: 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 vfs tree with the vfs-brauner tree
Message-ID: <20231220104110.56ae9b36@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/b4PHeWdP57aqouLzyNAjazv";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785755643077750644
X-GMAIL-MSGID: 1785755643077750644
|
| Series |
linux-next: manual merge of the vfs tree with the vfs-brauner tree
|
|
Commit Message
Stephen Rothwell
Dec. 19, 2023, 11:41 p.m. UTC
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
Documentation/filesystems/porting.rst
between commit:
01bc8e9ae23a ("porting: document block device freeze and thaw changes")
from the vfs-brauner tree and commits:
22e111ed6c83 ("rename(): fix the locking of subdirectories")
a8b0026847b8 ("rename(): avoid a deadlock in the case of parents having no common ancestor")
da549bdd15c2 ("dentry: switch the lists of children to hlist")
2f42f1eb9093 ("Call retain_dentry() with refcount 0")
1c18edd1b7a0 ("__dentry_kill(): new locking scheme")
from the vfs 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 Documentation/filesystems/porting.rst index ced3a6761329,270cef3d84d4..000000000000 --- a/Documentation/filesystems/porting.rst