From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Theodore Ts'o <tytso@mit.edu>
Cc: Jan Kara <jack@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Subject: linux-next: manual merge of the mm-stable tree with the ext4 tree
Date: Mon, 20 Feb 2023 15:29:38 +1100 [thread overview]
Message-ID: <20230220152938.45f62d5a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi all,
Today's linux-next merge of the mm-stable tree got a conflict in:
fs/ext4/inode.c
between commits:
726432969963 ("ext4: use nr_to_write directly in mpage_prepare_extent_to_map()")
9ff6a9153c8f ("ext4: move page unlocking out of mpage_submit_page()")
b4d26e70a755 ("ext4: move mpage_page_done() calls after error handling")
9b18c23c131a ("ext4: convert data=journal writeback to use ext4_writepages()")
from the ext4 tree and commits:
50ead2537441 ("ext4: convert mpage_prepare_extent_to_map() to use filemap_get_folios_tag()")
d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")
from the mm-stable tree.
I have no idea how to fix this up, so I have used the ext4 tree from
next-20230217 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-20 4:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 4:29 Stephen Rothwell [this message]
2023-02-20 14:27 ` linux-next: manual merge of the mm-stable tree with the ext4 tree Matthew Wilcox
2023-02-21 6:54 ` Stephen Rothwell
2023-02-23 3:47 ` Stephen Rothwell
2023-02-24 2:42 ` Bagas Sanjaya
2023-02-24 5:11 ` Stephen Rothwell
2023-02-24 6:08 ` Linus Torvalds
2023-02-24 22:20 ` Theodore Ts'o
2023-02-24 23:01 ` 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=20230220152938.45f62d5a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=vishal.moola@gmail.com \
--cc=willy@infradead.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