From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: Matthew Wilcox <willy@infradead•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the folio tree with the fscache tree
Date: Thu, 24 Mar 2022 10:54:26 +1100 [thread overview]
Message-ID: <20220324105426.5250396a@canb.auug.org.au> (raw)
In-Reply-To: <20220315202816.7ff33386@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2653 bytes --]
Hi all,
On Tue, 15 Mar 2022 20:28:16 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the folio tree got a conflict in:
>
> fs/afs/file.c
>
> between commit:
>
> 0c31679cf2c0 ("netfs: Add a netfs inode context")
>
> from the fscache tree and commits:
>
> 7d165ab9d0a0 ("afs: Convert from launder_page to launder_folio")
> 09f7fc259e5d ("fscache: Convert fscache_set_page_dirty() to fscache_dirty_folio()")
>
> from the folio 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/afs/file.c
> index 2b68b2070248,0f9fdb284a20..000000000000
> --- a/fs/afs/file.c
> +++ b/fs/afs/file.c
> @@@ -19,11 -19,13 +19,11 @@@
> #include "internal.h"
>
> static int afs_file_mmap(struct file *file, struct vm_area_struct *vma);
> -static int afs_readpage(struct file *file, struct page *page);
> static int afs_symlink_readpage(struct file *file, struct page *page);
> - static void afs_invalidatepage(struct page *page, unsigned int offset,
> - unsigned int length);
> + static void afs_invalidate_folio(struct folio *folio, size_t offset,
> + size_t length);
> static int afs_releasepage(struct page *page, gfp_t gfp_flags);
>
> -static void afs_readahead(struct readahead_control *ractl);
> static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter);
> static void afs_vm_open(struct vm_area_struct *area);
> static void afs_vm_close(struct vm_area_struct *area);
> @@@ -50,12 -52,12 +50,12 @@@ const struct inode_operations afs_file_
> };
>
> const struct address_space_operations afs_file_aops = {
> - .readpage = afs_readpage,
> - .readahead = afs_readahead,
> + .readpage = netfs_readpage,
> + .readahead = netfs_readahead,
> - .set_page_dirty = afs_set_page_dirty,
> - .launder_page = afs_launder_page,
> + .dirty_folio = afs_dirty_folio,
> + .launder_folio = afs_launder_folio,
> .releasepage = afs_releasepage,
> - .invalidatepage = afs_invalidatepage,
> + .invalidate_folio = afs_invalidate_folio,
> .write_begin = afs_write_begin,
> .write_end = afs_write_end,
> .writepage = afs_writepage,
This is now a conflict between the fscache tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-03-23 23:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 9:28 linux-next: manual merge of the folio tree with the fscache tree Stephen Rothwell
2022-03-23 23:54 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 9:25 Stephen Rothwell
2022-03-23 23:53 ` Stephen Rothwell
2021-09-21 3:54 Stephen Rothwell
2021-11-01 22:07 ` Stephen Rothwell
2021-11-02 7:04 ` David Howells
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=20220324105426.5250396a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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