diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-25 15:40:21 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-25 15:40:21 -0700 | 
| commit | b8517e98305e3c76fa293133826afe39a690edcd (patch) | |
| tree | 55ce7797d169cd4f015b02a19c8762a72152951e /lib/net_utils.c | |
| parent | c875f421097a55d9126159957a2d812b91c9ce8c (diff) | |
| parent | c72efb658f7c8b27ca3d0efb5cfd5ded9fcac89e (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
 "A small collection of fixes that has been gathered over the last few
  weeks.  This contains:
   - A one-liner fix for NVMe, fixing a missing list_head init that
     could makes us oops on hitting recovery at load time.
   - Two small blk-mq fixes:
        - Fixup a bad goto jump on error handling.
        - Fix for oopsing if running out of reserved tags.
   - A memory leak fix for NBD.
   - Two small writeback fixes from Tejun, fixing a missing init to
     INITIAL_JIFFIES, and a possible underflow introduced recently.
   - A core merge fixup in sg gap detection, where rq->biotail was
     indexed with the count of rq->bio"
* 'for-linus' of git://git.kernel.dk/linux-block:
  writeback: fix possible underflow in write bandwidth calculation
  NVMe: Initialize device list head before starting
  Fix bug in blk_rq_merge_ok
  blkmq: Fix NULL pointer deref when all reserved tags in
  blk-mq: fix use of incorrect goto label in blk_mq_init_queue error path
  nbd: fix possible memory leak
  writeback: add missing INITIAL_JIFFIES init in global_update_bandwidth()
Diffstat (limited to 'lib/net_utils.c')
0 files changed, 0 insertions, 0 deletions
