diff options
| author | Linus Torvalds <[email protected]> | 2016-11-12 00:42:03 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-11-12 00:42:03 +0000 |
| commit | 5f3a5cb8e7d7334cfc42312ff58292bb0e7f5941 (patch) | |
| tree | 06548705767ec98371192ddafa69c9c51bf4583a /net/unix/af_unix.c | |
| parent | Merge tag 'pci-v4.9-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | drbd: Fix kernel_sendmsg() usage - potential NULL deref (diff) | |
| download | kernel-5f3a5cb8e7d7334cfc42312ff58292bb0e7f5941.tar.gz kernel-5f3a5cb8e7d7334cfc42312ff58292bb0e7f5941.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Two small (really, one liners both of them!) fixes that should go into
this series:
- Request allocation error handling fix for nbd, from Christophe,
fixing a regression in this series.
- An oops fix for drbd. Not a regression in this series, but stable
material. From Richard"
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: Fix kernel_sendmsg() usage - potential NULL deref
nbd: Fix error handling
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions