projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ccaecd 1c1a2ee)
Merge tag 'for-linus-20180518' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2018 17:10:43 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2018 17:10:43 +0000 (10:10 -0700)
Pull block fix from Jens Axboe:
 "Single fix this time, from Coly, fixing a failure case when
  CONFIG_DEBUGFS isn't enabled"

* tag 'for-linus-20180518' of git://git.kernel.dk/linux-block:
  bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n


Trivial merge
John Crispins staging tree