| Message ID | 20231122125539.5a7df3a3@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id
io7csp1040455vqb;
Tue, 21 Nov 2023 17:55:57 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEe7LPliGi8khBku1sqKU2bvZWGkgl5kGjxfCsu/4cB/1Rw7AG3sr/tx4TdfEnxO0njUrdT
X-Received: by 2002:a17:902:d4c4:b0:1cf:5cb6:226b with SMTP id
o4-20020a170902d4c400b001cf5cb6226bmr1057888plg.28.1700618157273;
Tue, 21 Nov 2023 17:55:57 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1700618157; cv=none;
d=google.com; s=arc-20160816;
b=KiGourvDqMnMZ0M3hFd05TXoXMR+tJfqu5TqYgpcjvojrlL+QA4PyMacPQae7pZION
u5E3oO/Q/GA60OLBeH+T8/5Ble3ijFZa7Z4OR4lTsw0cGHlok9rpD7sbwXtSGoK+wgxf
8VIr08lD7fMLdMX26s4sv86z23VXuYQWQ9XgQ17dYzLhYnQ9bqZvm7hwEKPY2stcaeWn
RNER17Qr0yhwSO/FaYggUdonMTUAnnEdeYDBMJcDRsUZW/pq0ee2+HrljJjFgEJq4wQg
+g+cbUUeW/0HS/FdljCRxBCFxMtA6bZg6qU8rMQ9fSX8kqp7IgGL8Jiuf3IgeLii/IIz
DHZw==
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=7FPZrQpXckwEBiIN9Y1g3A9pS2bcgEzzAWiPT+SeB5I=;
fh=e487UaSWwFXOY8rWMEQJ9HDzaYGhZaO6KvFuWFHFwbA=;
b=tVN8qkokynzcg31G0Yd82ak4gdvWyziJDWe/ulMpWD1ESulLCPUzAeTMcrbSz77xB9
6XawART+YUVTKvto8rVLPYBe4wBtDrNcuAheDcvPXJuHOgA0A0NTEBtScG8JmUKRmOcV
MTa4FzpelRDJBByVDVmGs3qek8Ccca3dM2RGrkfyj8yrqglWasBsvTekZPnvgaDyRSPx
/dPvMv43C/Mlp5hGRq+EB5wv9631OwNbuZZLUbo8ZHaz7ni9DeNxGRfl8BJGkoX4lse6
kmOwBD4wHrVoyzcxxZY++n3lemULbvJBO+BIU9ByFo5MAlDB3R2VhUH3IccANNgmljgj
BtTA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LSt7nN3k;
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
a16-20020a170902ecd000b001ce5b8cb05dsi12318421plh.598.2023.11.21.17.55.56
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 21 Nov 2023 17:55:57 -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=LSt7nN3k;
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 61B7D80EA4DF;
Tue, 21 Nov 2023 17:55:47 -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 S232932AbjKVBzr (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others);
Tue, 21 Nov 2023 20:55:47 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45926 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229775AbjKVBzq (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 21 Nov 2023 20:55:46 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11ADD191;
Tue, 21 Nov 2023 17:55:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1700618141;
bh=7FPZrQpXckwEBiIN9Y1g3A9pS2bcgEzzAWiPT+SeB5I=;
h=Date:From:To:Cc:Subject:From;
b=LSt7nN3kuHNFZSSk8DWiD852msXu5uKO6t7YWtdui95oa1Ic65OCitI9uWln5JUro
Qt9fSovUvXI64CfHf+E8FO6fmbB8rCeVscBtkxY9GyCfYK8vkb/ejTU4/iEU4pQL1A
A7hSIuay7LpCyOV5hKsdUFwDcT6tbzsz6j64knbVIUjYev5pFHel3ZUV/tOo2mlCy6
fODth7pB8EQdZAr7VPDVpgE7dkhKfj5e3KucU4RwKv0t59uFR0ostTV59pp22x74vV
oj6z+Ip0ssGMNEExbamkaiR/SXm0yr7ijL+FN8deWYgREhMSHT4phWu3FqZMCiTcIL
Atof8VF48yPeg==
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 4SZkq03tmpz4xNt;
Wed, 22 Nov 2023 12:55:40 +1100 (AEDT)
Date: Wed, 22 Nov 2023 12:55:39 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Christian Brauner <brauner@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>,
Sean Christopherson <seanjc@google.com>,
Vlastimil Babka <vbabka@suse.cz>
Subject: linux-next: manual merge of the kvm tree with the vfs-brauner tree
Message-ID: <20231122125539.5a7df3a3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/honfjtDRMxpjius90+yuCtF";
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]);
Tue, 21 Nov 2023 17:55:47 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1783227385189315254
X-GMAIL-MSGID: 1783227385189315254
|
| Series |
linux-next: manual merge of the kvm tree with the vfs-brauner tree
|
|
Commit Message
Stephen Rothwell
Nov. 22, 2023, 1:55 a.m. UTC
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
include/linux/pagemap.h
between commit:
762321dab9a7 ("filemap: add a per-mapping stable writes flag")
from the vfs-brauner tree and commit:
0003e2a41468 ("mm: Add AS_UNMOVABLE to mark mapping as completely unmovable")
from the kvm 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
On Wed, Nov 22, 2023 at 12:55:39PM +1100, Stephen Rothwell wrote: > index 06142ff7f9ce,bf2965b01b35..000000000000 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@@ -203,9 -203,8 +203,10 @@@ enum mapping_flags > /* writeback related tags are not used */ > AS_NO_WRITEBACK_TAGS = 5, > AS_LARGE_FOLIO_SUPPORT = 6, > - AS_RELEASE_ALWAYS, /* Call ->release_folio(), even if no private data */ > + AS_RELEASE_ALWAYS = 7, /* Call ->release_folio(), even if no private data */ > + AS_UNMOVABLE = 8, /* The mapping cannot be moved, ever */ > + AS_STABLE_WRITES, /* must wait for writeback before modifying > + folio contents */ > }; Note that AS_STABLE_WRITES, is a fix for 6.7, so this will probably end up getting reordered. It might also be worth to remove all the explicit number assignments here to make the merge conflict resolution a bit easier in the future.
On Wed, Nov 22, 2023 at 08:10:40AM +0100, Christoph Hellwig wrote: > On Wed, Nov 22, 2023 at 12:55:39PM +1100, Stephen Rothwell wrote: > > index 06142ff7f9ce,bf2965b01b35..000000000000 > > --- a/include/linux/pagemap.h > > +++ b/include/linux/pagemap.h > > @@@ -203,9 -203,8 +203,10 @@@ enum mapping_flags > > /* writeback related tags are not used */ > > AS_NO_WRITEBACK_TAGS = 5, > > AS_LARGE_FOLIO_SUPPORT = 6, > > - AS_RELEASE_ALWAYS, /* Call ->release_folio(), even if no private data */ > > + AS_RELEASE_ALWAYS = 7, /* Call ->release_folio(), even if no private data */ > > + AS_UNMOVABLE = 8, /* The mapping cannot be moved, ever */ > > + AS_STABLE_WRITES, /* must wait for writeback before modifying > > + folio contents */ > > }; > > Note that AS_STABLE_WRITES, is a fix for 6.7, so this will probably Yes, I plan on sending a fixes pr on Friday. I've wanted this in -next for a few days.
Hi Christoph, On Wed, 22 Nov 2023 08:10:40 +0100 Christoph Hellwig <hch@lst.de> wrote: > > On Wed, Nov 22, 2023 at 12:55:39PM +1100, Stephen Rothwell wrote: > > index 06142ff7f9ce,bf2965b01b35..000000000000 > > --- a/include/linux/pagemap.h > > +++ b/include/linux/pagemap.h > > @@@ -203,9 -203,8 +203,10 @@@ enum mapping_flags > > /* writeback related tags are not used */ > > AS_NO_WRITEBACK_TAGS = 5, > > AS_LARGE_FOLIO_SUPPORT = 6, > > - AS_RELEASE_ALWAYS, /* Call ->release_folio(), even if no private data */ > > + AS_RELEASE_ALWAYS = 7, /* Call ->release_folio(), even if no private data */ > > + AS_UNMOVABLE = 8, /* The mapping cannot be moved, ever */ > > + AS_STABLE_WRITES, /* must wait for writeback before modifying > > + folio contents */ > > }; > > Note that AS_STABLE_WRITES, is a fix for 6.7, so this will probably > end up getting reordered. It might also be worth to remove all the > explicit number assignments here to make the merge conflict resolution > a bit easier in the future. Thanks, I will reorder them from today (and drop the numbering on the added ones).
Hi all, On Wed, 22 Nov 2023 12:55:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the kvm tree got a conflict in: > > include/linux/pagemap.h > > between commit: > > 762321dab9a7 ("filemap: add a per-mapping stable writes flag") This is now in Linus' tree. > from the vfs-brauner tree and commit: > > 0003e2a41468 ("mm: Add AS_UNMOVABLE to mark mapping as completely unmovable") > > from the kvm 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. The current resolution is below.
diff --cc include/linux/pagemap.h index 06142ff7f9ce,bf2965b01b35..000000000000 --- a/include/linux/pagemap.h