diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-08 19:49:35 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-08 19:49:35 -0700 | 
| commit | 1daac193f21d6e3d0adc528a06a7e11522d4254d (patch) | |
| tree | 4034f896bc92bc3568c0e9bc1cd1df0af884d625 /net/switchdev/switchdev.c | |
| parent | 41c64bb19c740b5433f768032ecaf05375c955ee (diff) | |
| parent | 0ff28d9f4674d781e492bcff6f32f0fe48cf0fed (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
 "A collection of fixes since the merge window;
   - fix for a double elevator module release, from Chao Yu.  Ancient bug.
   - the splice() MORE flag fix from Christophe Leroy.
   - a fix for NVMe, fixing a patch that went in in the merge window.
     From Keith.
   - two fixes for blk-mq CPU hotplug handling, from Ming Lei.
   - bdi vs blockdev lifetime fix from Neil Brown, fixing and oops in md.
   - two blk-mq fixes from Shaohua, fixing a race on queue stop and a
     bad merge issue with FUA writes.
   - division-by-zero fix for writeback from Tejun.
   - a block bounce page accounting fix, making sure we inc/dec after
     bouncing so that pre/post IO pages match up.  From Wang YanQing"
* 'for-linus' of git://git.kernel.dk/linux-block:
  splice: sendfile() at once fails for big files
  blk-mq: don't lose requests if a stopped queue restarts
  blk-mq: fix FUA request hang
  block: destroy bdi before blockdev is unregistered.
  block:bounce: fix call inc_|dec_zone_page_state on different pages confuse value of NR_BOUNCE
  elevator: fix double release of elevator module
  writeback: use |1 instead of +1 to protect against div by zero
  blk-mq: fix CPU hotplug handling
  blk-mq: fix race between timeout and CPU hotplug
  NVMe: Fix VPD B0 max sectors translation
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions
