| Message ID | 20231122125539.5a7df3a3@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm tree with the vfs-brauner tree | expand |
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
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.