Merge tag 'for-linus-20181205' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Dec 2018 21:28:01 +0000 (13:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Dec 2018 21:28:01 +0000 (13:28 -0800)
commit4eaaa2b99e30305f4bc677f4abfe56c1f8b39670
treef31de7aced04f268aa6ccd429c81ba4d880aded5
parentd0897090458211f9c6b2d7f5af87f4d3b0403f69
parentffe81d45322cc3cb140f0db080a4727ea284661e
Merge tag 'for-linus-20181205' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A bit earlier in the week as usual, but there's a fix here that should
  go in sooner rather than later.

  Under a combination of circumstance, the direct issue path in blk-mq
  could corrupt data. This wasn't easy to hit, but the ones that are
  affected by it, seem to hit it pretty easily. Full explanation in the
  patch. None of the regular filesystem and storage testing has
  triggered it, even though it's been around since 4.19-rc1.

  Outside of that, whitelist trim tweak for certain Samsung devices for
  libata"

* tag 'for-linus-20181205' of git://git.kernel.dk/linux-block:
  blk-mq: fix corruption with direct issue
  libata: whitelist all SAMSUNG MZ7KM* solid-state disks