From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Jul 2023 18:14:54 +0000 (-0700)
Subject: Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: nvme-6.5-2023-07-13~47
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451;p=nvme.git

Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/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
---

a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451