Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jun 2018 17:00:20 +0000 (10:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jun 2018 17:00:20 +0000 (10:00 -0700)
commit4a189982e293e662d719f5dd3ba6eec247d7bbc2
treea2384a2e4f56999a15fa80f0a07bff9fe23597f3
parent4189b863ba327bac4a869773aea4995f7716945a
parent9a6d9a62e0fd4b9927c3124db0f25fc6b4fb6576
Merge branch 'work.aio' of git://git./linux/kernel/git/viro/vfs

Pull aio iopriority support from Al Viro:
 "The rest of aio stuff for this cycle - Adam's aio ioprio series"

* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: aio ioprio use ioprio_check_cap ret val
  fs: aio ioprio add explicit block layer dependence
  fs: iomap dio set bio prio from kiocb prio
  fs: blkdev set bio prio from kiocb prio
  fs: Add aio iopriority support
  fs: Convert kiocb rw_hint from enum to u16
  block: add ioprio_check_cap function
drivers/block/loop.c
fs/block_dev.c
fs/iomap.c
include/linux/fs.h