aboutsummaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLinus Torvalds2019-06-10 07:43:30 -1000
committerLinus Torvalds2019-06-10 07:43:30 -1000
commit01ccc3ad44130458769646204449e2e4124f15da (patch)
treeda72d2b2acc7f8625ad1cd87bd65ba7050f702fe /fs/btrfs
parent5e3b6b8ecc53ffec9472ce5468307061072a5ded (diff)
parentcf8929885de318c0bf73438c9e5dde59d6536f7c (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
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions