projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
John Crispins staging tree