diff options
author | Linus Torvalds | 2019-09-25 09:01:43 -0700 |
---|---|---|
committer | Linus Torvalds | 2019-09-25 09:01:43 -0700 |
commit | 4ef5b13a294c136c9673a8e04e6afea333c7f755 (patch) | |
tree | 68618f424e4e24d25855bf64f90fa2cc0ec10d00 /.gitattributes | |
parent | 351c8a09b00b5c51c8f58b016fffe51f87e2d820 (diff) | |
parent | 838c4f3d7515efe9d0e32c846fb5d102b6d8a29d (diff) |
Merge tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions