From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Feb 2018 22:05:11 +0000 (-0800)
Subject: Merge tag 'for-linus-20180210' of git://git.kernel.dk/linux-block
X-Git-Tag: v6.6-pxa1908~14780
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=9454473c9dccb7b9d25e5baf915a082bfd490b33;p=linux.git

Merge tag 'for-linus-20180210' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A few fixes to round off the merge window on the block side:

   - a set of bcache fixes by way of Michael Lyle, from the usual bcache
     suspects.

   - add a simple-to-hook-into function for bpf EIO error injection.

   - fix blk-wbt that mischarectized flushes as reads. Improve the logic
     so that flushes and writes are accounted as writes, and only reads
     as reads. From me.

   - fix requeue crash in BFQ, from Paolo"

* tag 'for-linus-20180210' of git://git.kernel.dk/linux-block:
  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
---

9454473c9dccb7b9d25e5baf915a082bfd490b33