projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28c7980 447a0bc)
Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jul 2023 18:14:54 +0000 (11:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jul 2023 18:14:54 +0000 (11:14 -0700)
Pull iomap updates from Darrick Wong:

 - Fix a type signature mismatch

 - Drop Christoph as maintainer

* tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: drop me [hch] from MAINTAINERS for iomap
  fs: iomap: Change the type of blocksize from 'int' to 'unsigned int' in iomap_file_buffered_write_punch_delalloc

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
fs/iomap/buffered-io.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc fs/iomap/buffered-io.c
Simple merge
Domain: System / Kernel;