diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 20:31:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 20:31:17 +0200 |
| commit | 6890ad4b3889e13c919108d16b6fdd8d4a118de5 (patch) | |
| tree | 0fc20ec6a1fcaccbb5764acda276d1e4f633940d /drivers/media/pci/saa7134/saa7134-empress.c | |
| parent | Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | block: provide compat ioctl for BLKZEROOUT (diff) | |
| download | linux-6890ad4b3889e13c919108d16b6fdd8d4a118de5.tar.xz linux-6890ad4b3889e13c919108d16b6fdd8d4a118de5.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Final block fixes for 3.16
Four small fixes that should go into 3.16, have been queued up for a
bit and delayed due to vacation and other euro duties. But here they
are. The pull request contains:
- Fix for a reported crash with shared tagging on SCSI from Christoph
- A regression fix for drbd. From Lars Ellenberg.
- Hooking up the compat ioctl for BLKZEROOUT, which requires no
translation. From Mikulas.
- A fix for a regression where we woud crash on queue exit if the
root_blkg is gone/not there. From Tejun"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: provide compat ioctl for BLKZEROOUT
blkcg: don't call into policy draining if root_blkg is already gone
drbd: fix regression 'out of mem, failed to invoke fence-peer helper'
block: don't assume last put of shared tags is for the host
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-empress.c')
0 files changed, 0 insertions, 0 deletions