diff options
author | Jens Axboe <axboe@kernel.dk> | 2018-02-07 23:54:25 +0100 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-02-07 23:54:25 +0100 |
commit | 8525e5ff456592effe83640ea1702525e35b0363 (patch) | |
tree | 9943d51f75ba4f53fbbb900cef3ae4735882b796 /drivers/net | |
parent | Merge branch 'master' into test (diff) | |
parent | block, bfq: add requeue-request hook (diff) | |
download | linux-8525e5ff456592effe83640ea1702525e35b0363.tar.xz linux-8525e5ff456592effe83640ea1702525e35b0363.zip |
Merge branch 'for-linus' into test
* for-linus:
block, bfq: add requeue-request hook
bcache: fix for data collapse after re-attaching an attached device
bcache: return attach error when no cache set exist
bcache: set writeback_rate_update_seconds in range [1, 60] seconds
bcache: fix for allocator and register thread race
bcache: set error_limit correctly
bcache: properly set task state in bch_writeback_thread()
bcache: fix high CPU occupancy during journal
bcache: add journal statistic
block: Add should_fail_bio() for bpf error injection
blk-wbt: account flush requests correctly
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions