From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <chao@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the f2fs tree
Date: Mon, 2 Sep 2024 09:24:05 +1000 [thread overview]
Message-ID: <20240902092405.7c26e742@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/f2fs/data.c
between commits:
f13c7184e62e ("f2fs: convert f2fs_write_begin() to use folio")
357dd8479f8b ("f2fs: convert f2fs_write_end() to use folio")
(and maybe others)
from the f2fs tree and commits:
a0f858d450ce ("f2fs: Convert f2fs_write_end() to use a folio")
dfd2e81d37e1 ("f2fs: Convert f2fs_write_begin() to use a folio")
a225800f322a ("fs: Convert aops->write_end to take a folio")
1da86618bdce ("fs: Convert aops->write_begin to take a folio")
from the vfs-brauner tree.
This was too much for me to fix up, so I just used the f2fs tree from
next-20240830 for today. Please discuss this and fix things up.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-09-01 23:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-01 23:24 Stephen Rothwell [this message]
2024-09-05 0:18 ` linux-next: manual merge of the vfs-brauner tree with the f2fs tree Stephen Rothwell
2024-09-05 4:00 ` Chao Yu
2024-09-16 22:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-07-13 22:25 Stephen Rothwell
2024-02-28 23:41 Stephen Rothwell
2024-02-29 17:13 ` Jaegeuk Kim
2024-03-05 0:35 ` Stephen Rothwell
2024-03-05 0:40 ` Jaegeuk Kim
2024-03-12 4:02 ` Stephen Rothwell
2023-08-15 1:33 Stephen Rothwell
2023-08-15 1:30 Stephen Rothwell
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=20240902092405.7c26e742@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).