Merge tag 'for-linus-20190706' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jul 2019 18:48:39 +0000 (11:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jul 2019 18:48:39 +0000 (11:48 -0700)
commit46713c3d2f8da5e3d8ddd2249bcb1d9974fb5d28
tree85bf3562082388968bb831dcf9ea2d004fef1147
parentbcc0e65f47def010d8d1c4cf09bdc698fe061b77
parent7e41c3c9b6ceb2da52ba9d2b328d1851f269a48e
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