diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-29 14:10:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-29 14:10:37 -0700 |
| commit | 374bf8831aa99a445d6d26c56a65fb35db747d91 (patch) | |
| tree | fa7f85706041be3969a2d0397f08f4f933b54a81 /net/unix/af_unix.c | |
| parent | arch: remove unused macro/function thread_saved_pc() (diff) | |
| parent | block: provide bio_uninit() free freeing integrity/task associations (diff) | |
| download | wireguard-linux-374bf8831aa99a445d6d26c56a65fb35db747d91.tar.xz wireguard-linux-374bf8831aa99a445d6d26c56a65fb35db747d91.zip | |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions