From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-mm@kvack.org, mm-commits@vger.kernel.org,
linux-kernel@vger.kernel.org,
Andreas Gruenbacher <agruenba@redhat.com>
Subject: Re: [GIT PULL] MM updates for 6.3-rc1
Date: Tue, 21 Feb 2023 15:36:54 -0800 [thread overview]
Message-ID: <20230221153654.093d16a9ebe455644fd805ca@linux-foundation.org> (raw)
In-Reply-To: <20230220135225.91b0f28344c01d5306c31230@linux-foundation.org>
On Mon, 20 Feb 2023 13:52:25 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> There are a lot of conflicts in your future, mainly because of the
> ongoing folio conversion work. This will hopefully come to an end
> fairly soon. Forthcoming conflicts which are known about, along with
> Stephen's fixes are:
> ...
And... I failed to mention a conflict which didn't generate a reject,
thanks to a post-6.2-rc4 gfs2 patch.
Stephen's fix for this is at
https://lkml.kernel.org/r/20230127173638.1efbe423@canb.auug.org.au
Or,
From: Andrew Morton <akpm@linux-foundation.org>
Subject: fs/gfs2/log.c: fix build in __gfs2_writepage()
Date: Tue Feb 21 03:23:08 PM PST 2023
mm-stable was based on 6.2-rc4 and hence its patch d585bdbeb79a ("fs:
convert writepage_t callback to pass a folio") didn't know about the
post-rc4 95ecbd0f162f ("Revert "gfs2: stop using generic_writepages in
gfs2_ail1_start_one"").
Net result is that d585bdbeb79a failed to convert fs/gfs2/log.c. The fix
is from Andreas.
Fixes: d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")
Reported-by: Andreas Gruenbacher <agruenba@redhat.com>
Link: https://lkml.kernel.org/r/20230203105401.3362277-1-agruenba@redhat.com
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
--- a/fs/gfs2/log.c~fs-gfs2-logc-fix-build-in-__gfs2_writepage
+++ a/fs/gfs2/log.c
@@ -80,11 +80,11 @@ void gfs2_remove_from_ail(struct gfs2_bu
brelse(bd->bd_bh);
}
-static int __gfs2_writepage(struct page *page, struct writeback_control *wbc,
- void *data)
+static int __gfs2_writepage(struct folio *folio, struct writeback_control *wbc,
+ void *data)
{
struct address_space *mapping = data;
- int ret = mapping->a_ops->writepage(page, wbc);
+ int ret = mapping->a_ops->writepage(&folio->page, wbc);
mapping_set_error(mapping, ret);
return ret;
}
_
next prev parent reply other threads:[~2023-02-21 23:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 21:52 [GIT PULL] MM updates for 6.3-rc1 Andrew Morton
2023-02-21 23:36 ` Andrew Morton [this message]
2023-02-24 1:33 ` pr-tracker-bot
2023-02-24 1:33 ` Linus Torvalds
2023-02-24 1:56 ` Andrew Morton
2023-02-24 3:01 ` Huang, Ying
2023-02-24 9:04 ` David Howells
2023-02-24 12:12 ` David Howells
2023-02-24 14:31 ` [RFC][PATCH] cifs: Fix cifs_writepages_region() David Howells
2023-02-24 16:06 ` Linus Torvalds
2023-02-24 16:11 ` Matthew Wilcox
2023-02-24 17:15 ` David Howells
2023-02-24 18:44 ` Matthew Wilcox
2023-02-24 20:13 ` David Howells
2023-02-24 20:16 ` Linus Torvalds
2023-02-24 20:45 ` Matthew Wilcox
2023-02-27 13:20 ` David Howells
2023-02-24 20:58 ` David Howells
2023-02-24 17:19 ` David Howells
2023-02-24 18:58 ` Linus Torvalds
2023-02-24 19:05 ` Linus Torvalds
2023-02-24 22:11 ` [EXTERNAL] " Steven French
2023-03-01 18:32 ` Steven French
2023-02-24 14:48 ` [RFC][PATCH] cifs, afs: Revert changes to {cifs,afs}_writepages_region() David Howells
2023-02-24 16:13 ` Linus Torvalds
2023-02-24 15:13 ` [RFC][PATCH] cifs: Improve use of filemap_get_folios_tag() David Howells
2023-02-24 16:22 ` Linus Torvalds
2023-02-24 17:22 ` David Howells
2023-02-26 2:43 ` [GIT PULL] MM updates for 6.3-rc1 Linus Torvalds
2023-02-26 3:27 ` Linus Torvalds
2023-02-26 3:53 ` Linus Torvalds
2023-02-26 3:57 ` Andrew Morton
2023-02-26 4:03 ` Linus Torvalds
2023-02-26 4:12 ` Linus Torvalds
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=20230221153654.093d16a9ebe455644fd805ca@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=agruenba@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mm-commits@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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).