projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e3b6b8 cf89298)
Merge tag 'for-linus-20190610' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jun 2019 17:43:30 +0000 (07:43 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jun 2019 17:43:30 +0000 (07:43 -1000)
commit01ccc3ad44130458769646204449e2e4124f15da
treeda72d2b2acc7f8625ad1cd87bd65ba7050f702fetree | snapshot
parent5e3b6b8ecc53ffec9472ce5468307061072a5dedcommit | diff
parentcf8929885de318c0bf73438c9e5dde59d6536f7ccommit | diff
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
Linux 6.x block layer and io_uring tree(s)