From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 May 2019 18:43:32 +0000 (-0700)
Subject: Merge tag 'iomap-5.2-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: for-linus-20190516~84
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d8456eaf319a27d33186f1091bc1ff5c59cf0f0d;p=linux-2.6-block.git

Merge tag 'iomap-5.2-merge-2' of git://git./fs/xfs/xfs-linux

Pull iomap updates from Darrick Wong:
 "Nothing particularly exciting here, just adding some callouts for gfs2
  and cleaning a few things.

  Summary:

   - Add some extra hooks to the iomap buffered write path to enable
     gfs2 journalled writes

   - SPDX conversion

   - Various refactoring"

* tag 'iomap-5.2-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: move iomap_read_inline_data around
  iomap: Add a page_prepare callback
  iomap: Fix use-after-free error in page_done callback
  fs: Turn __generic_write_end into a void function
  iomap: Clean up __generic_write_end calling
  iomap: convert to SPDX identifier
---

d8456eaf319a27d33186f1091bc1ff5c59cf0f0d