From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Richard Weinberger <richard@nod•at>
Cc: Matthew Wilcox <willy@infradead•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Zhihao Cheng <chengzhihao1@huawei•com>
Subject: Re: linux-next: manual merge of the folio tree with the ubifs-fixes tree
Date: Thu, 24 Mar 2022 08:56:53 +1100 [thread overview]
Message-ID: <20220324085653.4c4c5315@canb.auug.org.au> (raw)
In-Reply-To: <20220315205259.71b4238a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1505 bytes --]
Hi all,
On Tue, 15 Mar 2022 20:52:59 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-03-23 21:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 9:52 linux-next: manual merge of the folio tree with the ubifs-fixes tree Stephen Rothwell
2022-03-16 1:12 ` Zhihao Cheng
2022-03-23 21:56 ` Stephen Rothwell [this message]
2022-03-23 22:17 ` Richard Weinberger
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=20220324085653.4c4c5315@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chengzhihao1@huawei$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=richard@nod$(echo .)at \
--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