From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Christian Brauner <brauner@kernel.org>,
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: Re: linux-next: manual merge of the kvm tree with the vfs-brauner tree
Date: Wed, 22 Nov 2023 08:10:40 +0100 [thread overview]
Message-ID: <20231122071040.GA4104@lst.de> (raw)
In-Reply-To: <20231122125539.5a7df3a3@canb.auug.org.au>
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.
next prev parent reply other threads:[~2023-11-22 7:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 1:55 linux-next: manual merge of the kvm tree with the vfs-brauner tree Stephen Rothwell
2023-11-22 7:10 ` Christoph Hellwig [this message]
2023-11-22 10:20 ` Christian Brauner
2023-11-22 21:11 ` Stephen Rothwell
2023-12-04 0:51 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231122071040.GA4104@lst.de \
--to=hch@lst.de \
--cc=brauner@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).