| Message ID | 20231127091437.4062f96c@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2711156vqx;
Sun, 26 Nov 2023 14:14:58 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IGyVFahM8waqNqBj+qa8EA67s9flxF+kIgMpbIDZmBgNtiFw59SqV/xGcnKW4QJMTf6DLCY
X-Received: by 2002:a05:6830:3a07:b0:6d3:3dcf:bb92 with SMTP id
di7-20020a0568303a0700b006d33dcfbb92mr10050016otb.37.1701036898425;
Sun, 26 Nov 2023 14:14:58 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1701036898; cv=none;
d=google.com; s=arc-20160816;
b=TaQJwb6dVv8lqaDrpNsbSk2pt7ZJQxK08i2hOViy4VumMQ5NGORxcfMgiu7UPPnzke
0G6fcDozgL2rNEeDREl988EdJTbzs9vx+FDxBt/9BSKkAqf8ZnEBeOuaJic9F6Ezx48g
ySp4z8PUFNtyyctN4SMKR5omx7qfTr6EyqcPbuRnqG6rKuV4uKeDZW5EPodOGRcCjqPr
YHL5r7sS//xgvSssjsq/3+F/Q0V973XrcraWWYWEIY5zIJskK61DDSvXdzwnNnJAM5Tj
rqvVSCYe5Zk80on5RkhmLA0Cz7d0eV5BzoD5DgAvhaCnMlfBy05dtmEKufmwDkN6aa8z
pzNg==
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=OpZS2AexNOfrXRUm1M+fIArYkz61bIJm4/IPafcYDz8=;
fh=odmibuwD+y492Ai/pflGZsSjh1aIFgeSwRzshL0VyKA=;
b=gBNnZcOldyczyne7ejyMMmYCnK93DMKrpHNUygcFq3cmmkbMv82vD1ZtVZrWyx1jx3
Ca7WAo+XXAlp83UkMP6+qK9puQyAEATtDJVwbkW7uKcXUZkC1d5OphbfMvbcSO1ziBXB
jIJ94r1uUESkc14bpKBXR3C49PaiSpa40eBuOwk4pOrDecQ21kHmIaUvxyfa5SVcHWlt
EVrgNISq2p3542aLro59C8g6VmQXcBa3xvwmQXSYNVxx2Hb10LW1OaIyEGeya4QKQBZ7
1tI6Iw9HOlqXT/tIv6O8z4G2ielrRB/r8FJimuOF/H/5G7BayV32jSIiIv8Fpz04MKEk
w+aQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Y8PFyBH5;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38])
by mx.google.com with ESMTPS id
e15-20020a631e0f000000b005c219360d9csi8648043pge.50.2023.11.26.14.14.57
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 26 Nov 2023 14:14:58 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Y8PFyBH5;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 3A92C80859B2;
Sun, 26 Nov 2023 14:14:49 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229524AbjKZWOi (ORCPT <rfc822;kernel.ruili@gmail.com>
+ 99 others); Sun, 26 Nov 2023 17:14:38 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48302 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229447AbjKZWOh (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 26 Nov 2023 17:14:37 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42897ED;
Sun, 26 Nov 2023 14:14:42 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1701036880;
bh=OpZS2AexNOfrXRUm1M+fIArYkz61bIJm4/IPafcYDz8=;
h=Date:From:To:Cc:Subject:From;
b=Y8PFyBH54Iuag2coKTKuZQfD1QN7rwJwurE8pUJtx6Zqcn6dfCLwWUKvgoQF+jWJ2
2L7ThNLRelQ1syjvlOdlPKQDYXXRwgUp8GG6vEOyMfDVi5ScvSItw9BufO37P0E0Aj
hrQXZRRsvKmKsAzIhjBxsZTKZWVW0eX2tvTUHm0v3J3we67fotMovSVHBS0W5pa/8b
GT6d6xxYV59TSU9HksSGg1HUkUYupVkXJ3dlBbVbQ9LV7WgUbXSBSTwR+Pd8L6vxLf
kRdjurVz1yja8Sgx7khTQYJGqQ0fWIHh5Gv4m453dtXvJflVskoQPwD8iRgNzeb2i2
rLaZHsO6ixq5w==
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 4Sdjgg6P7tz4wc3;
Mon, 27 Nov 2023 09:14:39 +1100 (AEDT)
Date: Mon, 27 Nov 2023 09:14:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>,
David Sterba <dsterba@suse.cz>
Cc: David Sterba <dsterba@suse.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
Qu Wenruo <wqu@suse.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the btrfs
tree
Message-ID: <20231127091437.4062f96c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Dse0H36zV=K5vfNRjUVbwgI";
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 fry.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 (fry.vger.email [0.0.0.0]);
Sun, 26 Nov 2023 14:14:49 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1783666466815267879
X-GMAIL-MSGID: 1783666466815267879
|
| Series |
linux-next: manual merge of the vfs-brauner tree with the btrfs tree
|
|
Commit Message
Stephen Rothwell
Nov. 26, 2023, 10:14 p.m. UTC
Hi all,
Today's linux-next merge of the vfs-brauner tree got conflicts in:
fs/btrfs/extent_io.c
fs/btrfs/subpage.c
between commit:
16aee93de711 ("btrfs: migrate to use folio private instead of page private")
from the btrfs tree and commit:
600f111ef51d ("fs: Rename mapping private members")
from the vfs-brauner 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/btrfs/extent_io.c index 40cf80af88b1,3431a53bf3fd..000000000000 --- a/fs/btrfs/extent_io.c diff --cc fs/btrfs/subpage.c index caf0013f2545,2347cf15278b..000000000000 --- a/fs/btrfs/subpage.c