author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 21 Jan 2013 00:44:28 +0000 (16:44 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 21 Jan 2013 00:44:28 +0000 (16:44 -0800) |
Pull module fixes and a virtio block fix from Rusty Russell:
"Various minor fixes, but a slightly more complex one to fix the
per-cpu overload problem introduced recently by kvm id changes."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
module: put modules in list much earlier.
module: add new state MODULE_STATE_UNFORMED.
module: prevent warning when finit_module a 0 sized file
virtio-blk: Don't free ida when disk is in use
"Various minor fixes, but a slightly more complex one to fix the
per-cpu overload problem introduced recently by kvm id changes."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
module: put modules in list much earlier.
module: add new state MODULE_STATE_UNFORMED.
module: prevent warning when finit_module a 0 sized file
virtio-blk: Don't free ida when disk is in use
1 | 2 | |||
---|---|---|---|---|
drivers/block/virtio_blk.c | patch | | diff1 | | diff2 | | blob | history |
kernel/module.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/block/virtio_blk.c
Simple merge
diff --cc kernel/module.c
Simple merge