From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jun 2019 17:43:30 +0000 (-1000)
Subject: Merge tag 'for-linus-20190610' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01ccc3ad44130458769646204449e2e4124f15da;p=android-x86%2Fkernel.git

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

Pull block cgroup symlink revert from Jens Axboe:
 "I talked to Tejun about this offline, and he's not a huge fan of the
  symlink.

  So let's revert this for now, and Paolo can do this properly for 5.3
  instead"

* tag 'for-linus-20190610' of git://git.kernel.dk/linux-block:
  cgroup/bfq: revert bfq.weight symlink change
---

01ccc3ad44130458769646204449e2e4124f15da