Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 24 Mar 2022 08:56:53 +1100

Hi all,

On Tue, 15 Mar 2022 20:52:59 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the folio tree got a conflict in:
> 
>   fs/ubifs/file.c
> 
> between commit:
> 
>   3b67db8a6ca8 ("ubifs: Fix to add refcount once page is set private")
> 
> from the ubifs-fixes tree and commit:
> 
>   c337f2f4f746 ("ubifs: Convert from invalidatepage to invalidate_folio")
> 
> from the folio tree.
> 
> I fixed it up (I hope - 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/ubifs/file.c
> index 6b45a037a047,8a9ffc2d4167..000000000000
> --- a/fs/ubifs/file.c
> +++ b/fs/ubifs/file.c
> @@@ -1304,8 -1304,8 +1304,8 @@@ static void ubifs_invalidate_folio(stru
>   		release_existing_page_budget(c);
>   
>   	atomic_long_dec(&c->dirty_pg_cnt);
> - 	detach_page_private(page);
> - 	ClearPageChecked(page);
>  -	folio_clear_private(folio);
> ++	folio_detach_private(folio);
> + 	folio_clear_checked(folio);
>   }
>   
>   int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)

This is now a conflict between the ubifs-fixes tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell