From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 7 Feb 2018 22:54:25 +0000 (-0700)
Subject: Merge branch 'for-linus' into test
X-Git-Tag: v5.15~9406^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8525e5ff456592effe83640ea1702525e35b0363;p=platform%2Fkernel%2Flinux-starfive.git

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
---

8525e5ff456592effe83640ea1702525e35b0363