Merge branch 'vfs-6.15.iomap' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs...
authorCarlos Maiolino <cem@kernel.org>
Mon, 10 Mar 2025 09:32:54 +0000 (10:32 +0100)
committerCarlos Maiolino <cem@kernel.org>
Mon, 10 Mar 2025 09:32:54 +0000 (10:32 +0100)
commit8657646d116db9428f21e4847891fc0c79e95597
tree67499a351a2415e162e792312f07f851bd5a228a
parent9b47d37496e2669078c8616334e5a7200f91681a
parentc7be0d72d5514caf0a64763d6c7a5503fb16acf1
Merge branch 'vfs-6.15.iomap' of git://git./linux/kernel/git/vfs/vfs into xfs-6.15-merge

XFS code for 6.15 depends on patches within iomap. Merge them before
pulling in XFS code.

Signed-off-by: Carlos Maiolino <cem@kernel.org>
fs/xfs/xfs_aops.c
fs/xfs/xfs_iomap.c