| Message ID | 20231221134527.38493677@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-7758-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp148436dyi;
Wed, 20 Dec 2023 18:45:59 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IE4iMVfaUiLoLFTS+y4mOoCV4nXssQUaz8b0e3eGGT2g4h3s/c4MnJNsms3sUQv67V8Nak9
X-Received: by 2002:a05:6512:3a89:b0:50e:3eaf:7405 with SMTP id
q9-20020a0565123a8900b0050e3eaf7405mr1956029lfu.16.1703126759170;
Wed, 20 Dec 2023 18:45:59 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1703126759; cv=none;
d=google.com; s=arc-20160816;
b=cgpqSoAyecpA/P9z8q4sfV+NTtLSy0z2vWAQK/Aq9TfFQMBYpTDJkhkOCsWkGWiL7E
cu7A0K8Cp9ts2fAm7NbppgM97FeZFrMFwFyHBdJtOhJT7+K+9toKqeRJKm3m+YC5yAH8
K8CPOfU6kovgw5ku9kBPN+9xxUmx/41VS+F+qRzxthU/CZOM8wYa0sttAdp7QKeqLgRb
RVssOAnYPcnNIyeAUXRFwUE2v+5FJJwoLwWXiVYbWQayi0i7AEtBEkmn7saXfXEFXyqP
q9tcFreEVvdyTc2O4dzCk3f1CaA65FWd5AkvGGkTsrnfzaGdGHgXlbJfq5LplADK0hvB
d5Jw==
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=4JUUkyq4Szf2FSLo/m+X1SFuBiyu9JLbhik0x5Gd5lU=;
fh=SER1E+GtjHyJDLXHz/7XUmpkTdfOCZnlgGd8c32FxlA=;
b=1FVkneRkzY4WOEM0daQ5LATj6DGBrW4IWViRD/WpazhAPIBLsNl0aaKIaZ8PwU9T8x
d/SMpRoFhdAxPlmYd2oPWhNXyQc7mZ/+CwuLBdhnqn/tqv7GkXiXOzt/a/F/rDJNvR1j
kS5iB4Dp+pWx28c5IBHjG40+VCNhwHlApLiq9B8wbs0VZBh7CMsX0jGw1jgwGXaAlsOo
haGD/nT8k6OTvsx9LnLLX4vXde0b00wMQOyd1SPMj957YLA2HuK4gWzO7UPpzYJH2rqe
FQO0syuhU7SIUHiiI9WdSgDNjodaejz4oeI57XMaahAOXFGP/HJinEMOmXvm2bB+Vbdv
Hyag==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iiWvjyLm;
spf=pass (google.com: domain of
linux-kernel+bounces-7758-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.80.249 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-7758-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249])
by mx.google.com with ESMTPS id
jo9-20020a170906f6c900b00a234681b215si420674ejb.340.2023.12.20.18.45.58
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 20 Dec 2023 18:45:59 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-7758-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iiWvjyLm;
spf=pass (google.com: domain of
linux-kernel+bounces-7758-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.80.249 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-7758-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 am.mirrors.kernel.org (Postfix) with ESMTPS id EEDB71F21D2B
for <ouuuleilei@gmail.com>; Thu, 21 Dec 2023 02:45:53 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 7DFBE5239;
Thu, 21 Dec 2023 02:45:41 +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="iiWvjyLm"
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 8E7163C34;
Thu, 21 Dec 2023 02:45:32 +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=1703126730;
bh=4JUUkyq4Szf2FSLo/m+X1SFuBiyu9JLbhik0x5Gd5lU=;
h=Date:From:To:Cc:Subject:From;
b=iiWvjyLmySbjYGHbpm4TDCKsdaA28J+R0REpM+lcfjXuIvRpmIZOO7pDr8vw3ekH1
SY4zm7AdPgvialOdj1ceqvza5A2KvvAvvqHC+AvN9R0LlgSQWU2URcPYfKXYR2zJXx
eH/XgignUCT2GEpNObkiCyQVcHZIFzVHPk/vYM+R5shtVEk7/wraijBJShynGxVvTc
vbVeHzNq10Xnzwx6qfS4gNiIH6B/ptiNSf11Vhp30FOp7tdMsGht8XP0U8qfG48Z7W
aaznfA+NI4YFiPinGVWtAViVaO/3hmV0fxmxUjPp8uRQ6K2aGc+U2+l7UdjgzxsEd7
n8hUZKj5bF79g==
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 4SwZY53yx6z4xGC;
Thu, 21 Dec 2023 13:45:28 +1100 (AEDT)
Date: Thu, 21 Dec 2023 13:45:27 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>, David Sterba <dsterba@suse.com>, 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 btrfs tree
Message-ID: <20231221134527.38493677@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_/ubuOmb9ut+BJKLRVkyv6T+I";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785857844683190017
X-GMAIL-MSGID: 1785857844683190017
|
| Series |
linux-next: manual merge of the block tree with the btrfs tree
|
|
Commit Message
Stephen Rothwell
Dec. 21, 2023, 2:45 a.m. UTC
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/zoned.h
between commit:
eefaf0a1a6f1 ("btrfs: fix typos found by codespell")
from the btrfs tree and commit:
7437bb73f087 ("block: remove support for the host aware zone model")
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.
Comments
Hi Stephen, the merge looks good, thanks. Although the comment is somewhat redundant now and could actually be removed.
diff --cc fs/btrfs/zoned.h index f24a5ffb7807,bc1b540c1597..000000000000 --- a/fs/btrfs/zoned.h