Re: linux-next: manual merge of the kvm tree with the vfs-brauner tree

Christoph Hellwig
2023-11-22T07:10:44Z

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.