projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 415be6c 58efbc9)
Merge branch 'for-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Aug 2017 21:10:31 +0000 (14:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Aug 2017 21:10:31 +0000 (14:10 -0700)
commitb71a5e3fe81c01dbd0b80eab7ae47d4cbd57d72a
treefe8ee359ac7e8c83547ffd29bd940250a384180dtree | snapshot
parent415be6c256ddb5ef2eccd9f45fc67d73d49f466acommit | diff
parent58efbc9f5463308c43d812fd0748a4dee44c8a16commit | diff
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
John Crispins staging tree