From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 May 2018 17:10:43 +0000 (-0700)
Subject: Merge tag 'for-linus-20180518' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.4.17~6047
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=61c2ad9a2e223962735b6ff6a5de85f1adcc892b;p=arm%2Flinux.git

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
---

61c2ad9a2e223962735b6ff6a5de85f1adcc892b