linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthew Wilcox <willy@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Brauner <brauner@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	David Howells <dhowells@redhat.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the vfs-brauner tree
Date: Thu, 21 Dec 2023 01:32:44 +0000	[thread overview]
Message-ID: <ZYOVvKJW4F/NZvUz@casper.infradead.org> (raw)
In-Reply-To: <20231221111847.689ea41f@canb.auug.org.au>

On Thu, Dec 21, 2023 at 11:18:47AM +1100, Stephen Rothwell wrote:
> I have applied the following merge resolution patch:

The merge resolution is correct ...

> +++ b/fs/netfs/buffered_write.c
> @@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapping,
>  			folio_end_fscache(folio);
>  		folio_end_writeback(folio);
>  		folio_lock(folio);
> -		generic_error_remove_page(mapping, folio_page(folio, 0));

but what Dave wrote here is _not_.

Call folio_page() when you need to go back from folio to page for
something that is intrinsically page based, like kmap().  This isn't
that case.  This is an interface that hadn't been converted yet, and
specifying &folio->page is the correct way to handle this because it's
an indication that there is work here to do before we can call the folio
conversion complete.

Please be more careful.

  reply	other threads:[~2023-12-21  1:33 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-21  0:18 linux-next: build failure after merge of the vfs-brauner tree Stephen Rothwell
2023-12-21  1:32 ` Matthew Wilcox [this message]
2023-12-21 23:41 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-04-04  2:24 Stephen Rothwell
2024-04-04  7:50 ` David Howells
2024-02-18 23:44 Stephen Rothwell
2024-03-12 23:41 ` Stephen Rothwell
2024-03-12 23:45   ` Chuck Lever III
2024-03-13  3:10     ` Stephen Rothwell
2024-02-11 23:52 Stephen Rothwell
2024-02-12  0:36 ` Kent Overstreet
2024-01-23  1:52 Stephen Rothwell
2024-01-24  1:20 ` Stephen Rothwell
2024-01-24 11:13   ` Christian Brauner
2024-01-24 11:35     ` Stephen Rothwell
2024-01-25 16:21       ` Christian Brauner
2023-10-31  1:07 Stephen Rothwell
2023-10-18 23:54 Stephen Rothwell
2023-10-19  9:17 ` Christian Brauner
2023-10-02 22:30 Stephen Rothwell
2023-10-03 13:24 ` Christian Brauner
2023-09-28  0:54 Stephen Rothwell
2023-10-02 11:21 ` Jan Kara
2023-10-02 11:26   ` Jan Kara
2023-10-02 21:24     ` Stephen Rothwell
2023-10-03 13:27   ` Kent Overstreet
2023-10-04 15:46     ` Jan Kara
2023-10-09 14:00       ` Christian Brauner
2023-09-28  0:39 Stephen Rothwell
2023-09-28 14:52 ` Christian Brauner
2023-08-03  0:03 Stephen Rothwell
2023-08-03 10:06 ` Jan Kara

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=ZYOVvKJW4F/NZvUz@casper.infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=brauner@kernel.org \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).