Merge branch 'nowait-aio-btrfs-fixup' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jul 2017 17:27:48 +0000 (10:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jul 2017 17:27:48 +0000 (10:27 -0700)
commit6618a24ab2313309e9df1cc06cc1f6786a6b6a9c
tree2a335d8110a87e047676e5fd41f24f547a3f7d05
parent1d07b6cb96bc17f844a0218ec783f017cc2d29ee
parentff0fa73247e442518936baa43c3f037b17f10fa7
Merge branch 'nowait-aio-btrfs-fixup' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fix from David Sterba:
 "This fixes a user-visible bug introduced by the nowait-aio patches
  merged in this cycle"

* 'nowait-aio-btrfs-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: nowait aio: Correct assignment of pos
fs/btrfs/file.c