From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Feb 2016 21:40:42 +0000 (-0800)
Subject: Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v4.14-rc1~3800
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce6b71432d42afe5c3ae25ab2980304c32ecb915;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-linus-4.5' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "My for-linus-4.5 branch has a btrfs DIO error passing fix.

  I know how much you love DIO, so I'm going to suggest against reading
  it.  We'll follow up with a patch to drop the error arg from
  dio_end_io in the next merge window."

* 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix direct IO requests not reporting IO error to user space
---

ce6b71432d42afe5c3ae25ab2980304c32ecb915