summaryrefslogtreecommitdiff
path: root/include/linux/timerqueue.h
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2026-11-05 15:53:00 +0100
committerChristian Brauner <brauner@kernel.org>2026-11-05 15:53:00 +0100
commitd2bf796905dfc706cbbb180b59f77d68aa9af7ac (patch)
tree7989bc47908d8c0460d7aedbf62232d5c28d84b5 /include/linux/timerqueue.h
parent66a52b662e5c09c7e784d2656e0b7ab14b396a8f (diff)
parent5612225809c78959c888fa7066bdfdf46b8aee45 (diff)
Merge patch series "iomap: remaining patches for iomap_iter_next conversion"
Joanne Koong <joannelkoong@gmail.com> says: This is a resend of the last 3 patches from the "iomap: convert to in-iter iomap_next() model" patch series [1]. Those 3 patches are rebased on top of current mainline (commit 83f32c773255 ("Merge tag 'erofs-for-7.4-rc1-2' ...")) in Linus's tree. They require two new preparatory patches (patches 1 and 2 in this series), which are trivial ->iomap_next() conversions of the nilfs2 and fuse iomap code that was added during this merge window. There were conflicts with "iomap: pass iomap_iter_next_fn directly instead of struct iomap_ops" (patch 4 in this series) during the rebase. These are resolved in the patch, which now also converts the iomap users added this merge window (ext4 iomap buffered I/O, exfat swap activation, nilfs2, and fuse ext_map). Jan's Acked-by and Christoph's Reviewed-by on it predate these changes. These patches are being sent out now in case anyone wants to look at the preparatory patches or patch 4. This series applies cleanly to both current mainline and next-20261027. If anything conflicts by the time you pick it up at the end of the merge window, I'll rebase and resend. [1] https://lore.kernel.org/linux-fsdevel/20260729192737.3190206-1-joannelkoong@gmail.com/ * patches from https://patch.msgid.link/20261027215326.2693300-1-joannelkoong@gmail.com: Documentation: iomap: update docs to reflect iomap_iter_next model iomap: pass iomap_iter_next_fn directly instead of struct iomap_ops iomap: remove ->iomap_begin()/->iomap_end() legacy path fuse: convert ext_map iomap ops to ->iomap_next() nilfs2: convert iomap ops to ->iomap_next() Link: https://patch.msgid.link/20261027215326.2693300-1-joannelkoong@gmail.com Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions