diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 16:42:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 16:42:03 -0800 |
| commit | 5f3a5cb8e7d7334cfc42312ff58292bb0e7f5941 (patch) | |
| tree | 06548705767ec98371192ddafa69c9c51bf4583a | |
| parent | 8233008f5d9703207c2a725cbfb7fd00e7e025e6 (diff) | |
| parent | d8e9e5e80e882b4f90cba7edf1e6cb7376e52e54 (diff) | |
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