From: Linus Torvalds Date: Fri, 1 Dec 2023 21:19:27 +0000 (+0900) Subject: Merge tag 'fs_for_v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c1c09da07c550971a1764a113963533dcc8e4d2a;p=linux.git Merge tag 'fs_for_v6.7-rc4' of git://git./linux/kernel/git/jack/linux-fs Pull ext2 fix from Jan Kara: "Fix an ext2 bug introduced by changes in ext2 & iomap stepping on each other toes (apparently ext2 driver does not get much testing in linux-next)" * tag 'fs_for_v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Fix ki_pos update for DIO buffered-io fallback case --- c1c09da07c550971a1764a113963533dcc8e4d2a