Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Enhanced partition statistics: documentation update Enhanced partition statistics: remove old partition statistics Enhanced partition statistics: procfs Enhanced partition statistics: sysfs Enhanced partition statistics: aoe fix Enhanced partition statistics: update partition statitics Enhanced partition statistics: core statistics block: fixup rq_init() a bit Manually fixed conflict in drivers/block/aoe/aoecmd.c due to statistics support.
Showing
- Documentation/ABI/testing/procfs-diskstats 22 additions, 0 deletionsDocumentation/ABI/testing/procfs-diskstats
- Documentation/ABI/testing/sysfs-block 28 additions, 0 deletionsDocumentation/ABI/testing/sysfs-block
- Documentation/iostats.txt 14 additions, 1 deletionDocumentation/iostats.txt
- block/blk-core.c 47 additions, 14 deletionsblock/blk-core.c
- block/blk-merge.c 6 additions, 0 deletionsblock/blk-merge.c
- block/genhd.c 22 additions, 6 deletionsblock/genhd.c
- drivers/block/aoe/aoecmd.c 6 additions, 6 deletionsdrivers/block/aoe/aoecmd.c
- fs/partitions/check.c 26 additions, 5 deletionsfs/partitions/check.c
- include/linux/blkdev.h 3 additions, 1 deletioninclude/linux/blkdev.h
- include/linux/genhd.h 142 additions, 11 deletionsinclude/linux/genhd.h
Loading
Please register or sign in to comment