From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Aug 2017 21:10:31 +0000 (-0700)
Subject: Merge branch 'for-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b71a5e3fe81c01dbd0b80eab7ae47d4cbd57d72a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-4.13-rc7' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fix from David Sterba:
 "We have one more fixup that stems from the blk_status_t conversion
  that did not quite cover everything.

  The normal cases were not affected because the code is 0, but any
  error and retries could mix up new and old values"

* 'for-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix blk_status_t/errno confusion
---

b71a5e3fe81c01dbd0b80eab7ae47d4cbd57d72a