From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Jun 2017 21:10:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v4.12~17
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=374bf8831aa99a445d6d26c56a65fb35db747d91

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

Pull block fixes from Jens Axboe:
 "Two fixes that should go into this release.

  One is an nvme regression fix from Keith, fixing a missing queue
  freeze if the controller is being reset. This causes the reset to
  hang.

  The other is a fix for a leak of the bio protection info, if smaller
  sized O_DIRECT is used. This fix should be more involved as we have
  other problematic paths in the kernel, but given as this isn't a
  regression in this series, we'll tackle those for 4.13"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: provide bio_uninit() free freeing integrity/task associations
  nvme/pci: Fix stuck nvme reset
---

374bf8831aa99a445d6d26c56a65fb35db747d91