From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jul 2019 18:48:39 +0000 (-0700)
Subject: Merge tag 'for-linus-20190706' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~6071
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46713c3d2f8da5e3d8ddd2249bcb1d9974fb5d28;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-20190706' of git://git.kernel.dk/linux-block

Pull block fix from Jens Axboe:
 "Just a single fix for a patch from Greg KH, which reportedly break
  block debugfs locations for certain setups. Trivial enough that I
  think we should include it now, rather than wait and release 5.2 with
  it, since it's a regression in this series"

* tag 'for-linus-20190706' of git://git.kernel.dk/linux-block:
  blk-mq: fix up placement of debugfs directory of queue files
---

46713c3d2f8da5e3d8ddd2249bcb1d9974fb5d28