diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-12 10:24:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-12 10:24:00 -0800 |
commit | 7807563183c4c1bec1bcc815e8bcc40d807c81b7 (patch) | |
tree | 4730f566d6391fdd597ad964c2d4d8870832b1ce /drivers/hid/hid-sjoy.c | |
parent | 6539756e68bf8fab1dfc08bddf00d9fbba8c071f (diff) | |
parent | af096e2235c5de76af7e8749f59a90de07f5e943 (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"A set of fixes for the current series. This contains:
- A bunch of fixes for lightnvm, should be the last round for this
series. From Matias and Wenwei.
- A writeback detach inode fix from Ilya, also marked for stable.
- A block (though it says SCSI) fix for an OOPS in SCSI runtime power
management.
- Module init error path fixes for null_blk from Minfei"
* 'for-linus' of git://git.kernel.dk/linux-block:
null_blk: Fix error path in module initialization
lightnvm: do not compile in debugging by default
lightnvm: prevent gennvm module unload on use
lightnvm: fix media mgr registration
lightnvm: replace req queue with nvmdev for lld
lightnvm: comments on constants
lightnvm: check mm before use
lightnvm: refactor spin_unlock in gennvm_get_blk
lightnvm: put blks when luns configure failed
lightnvm: use flags in rrpc_get_blk
block: detach bdev inode from its wb in __blkdev_put()
SCSI: Fix NULL pointer dereference in runtime PM
Diffstat (limited to 'drivers/hid/hid-sjoy.c')
0 files changed, 0 insertions, 0 deletions