From: Linus Torvalds Date: Thu, 2 Apr 2020 19:57:18 +0000 (-0700) Subject: Merge tag 'iomap-5.7-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=35a9fafe230bdefe3c37b06589bf622c857030c1;p=linux.git Merge tag 'iomap-5.7-merge-2' of git://git./fs/xfs/xfs-linux Pull iomap updates from Darrick Wong: "We're fixing tracepoints and comments in this cycle, so there shouldn't be any surprises here. I anticipate sending a second pull request next week with a single bug fix for readahead, but it's still undergoing QA. Summary: - Fix a broken tracepoint - Fix a broken comment" * tag 'iomap-5.7-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: iomap: fix comments in iomap_dio_rw iomap: Remove pgoff from tracepoints --- 35a9fafe230bdefe3c37b06589bf622c857030c1