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)
commit61c2ad9a2e223962735b6ff6a5de85f1adcc892b
treefc95c85aabca93f7d2e12ed6e128a586f2977746
parent8ccaecd014bcb52cd6651fb8be15dca6e6b9e04f
parent1c1a2ee1b53b006754073eefc65d2b2cedb5264b
Merge tag 'for-linus-20180518' of git://git.kernel.dk/linux-block

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