tree fa7f85706041be3969a2d0397f08f4f933b54a81
parent 6474924e2b5ddb0030c355558966adcbe3b49022
parent 9ae3b3f52c62ddd5eb12c57f195f4f38121faa01
author Linus Torvalds <torvalds@linux-foundation.org> 1498770637 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1498770637 -0700

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