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)
commita901a3568fd26ca9c4a82d8bc5ed5b3ed844d451
treef69741c34579567af3d31f68737ea322d9311892
parent28c7980fa14a3fbd8926686cfffb89b9542b0da1
parent447a0bc108e4bae4c1ea845aacf43c10c28814e8
Merge tag 'iomap-6.5-merge-1' of git://git./fs/xfs/xfs-linux

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
MAINTAINERS
fs/iomap/buffered-io.c