]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b47d37 c7be0d7)
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)
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>
1  2 
fs/xfs/xfs_aops.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_iomap.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_aops.c
Simple merge
diff --cc fs/xfs/xfs_iomap.c
Simple merge
A mirror of Linus' kernel repository