From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Sep 2019 16:01:43 +0000 (-0700)
Subject: Merge tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v5.15~5425
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ef5b13a294c136c9673a8e04e6afea333c7f755;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'iomap-5.4-merge-6' of git://git./fs/xfs/xfs-linux

Pull iomap updates from Darrick Wong:
 "After last week's failed pull request attempt, I scuttled everything
  in the branch except for the directio endio api changes, which were
  trivial. Everything else will simply have to wait for the next cycle.

  Summary:

   - Report both io errors and short io results to the directio endio
     handler.

   - Allow directio callers to pass an ops structure to iomap_dio_rw"

* tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: move the iomap_dio_rw ->end_io callback into a structure
  iomap: split size and error for iomap_dio_rw ->end_io
---

4ef5b13a294c136c9673a8e04e6afea333c7f755