]> err.no Git - linux-2.6/commit
[PATCH] s390: merge cmb into dasdc
authorChristoph Hellwig <hch@lst.de>
Fri, 24 Mar 2006 11:15:21 +0000 (03:15 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Mar 2006 15:33:17 +0000 (07:33 -0800)
commit8b2eb664ce9dcba8b54ececf5e057470c47e57f7
treedab47df832f199b0a1e9e20226b152feb522640a
parent1107ccfbdef280fedc677af3bdbc405611ba554a
[PATCH] s390: merge cmb into dasdc

dasd_cmd just implements three ioctls which are wrappers around functionality
in the core kernel or other modules.  When merging those into dasd_mod they
just add 22 lines of code which is far less than the amount of code removed in
the last two patches, and which doesn't spill into another 4k pages when build
modular, while removing a 128lines module.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/s390/block/Kconfig
drivers/s390/block/Makefile
drivers/s390/block/dasd_cmb.c [deleted file]
drivers/s390/block/dasd_ioctl.c