Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: (34 commits) cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatch loop: Update mtime when writing using aops block: expose the statistics in blkio.time and blkio.sectors for the root cgroup backing-dev: Handle class_create() failure Block: Fix block/elevator.c elevator_get() off-by-one error drbd: lc_element_by_index() never returns NULL cciss: unlock on error path cfq-iosched: Do not merge queues of BE and IDLE classes cfq-iosched: Add additional blktrace log messages in CFQ for easier debugging i2o: Remove the dangerous kobj_to_i2o_device macro block: remove 16 bytes of padding from struct request on 64bits cfq-iosched: fix a kbuild regression block: make CONFIG_BLK_CGROUP visible Remove GENHD_FL_DRIVERFS block: Export max number of segments and max segment size in sysfs block: Finalize conversion of block limits functions block: Fix overrun in lcm() and move it to lib vfs: improve writeback_inodes_wb() paride: fix off-by-one test drbd: fix al-to-on-disk-bitmap for 4k logical_block_size ...
Showing
- Documentation/DocBook/tracepoint.tmpl 13 additions, 0 deletionsDocumentation/DocBook/tracepoint.tmpl
- Documentation/block/biodoc.txt 2 additions, 2 deletionsDocumentation/block/biodoc.txt
- block/Kconfig 2 additions, 1 deletionblock/Kconfig
- block/blk-settings.c 1 addition, 10 deletionsblock/blk-settings.c
- block/blk-sysfs.c 25 additions, 0 deletionsblock/blk-sysfs.c
- block/cfq-iosched.c 31 additions, 10 deletionsblock/cfq-iosched.c
- block/elevator.c 1 addition, 1 deletionblock/elevator.c
- drivers/block/DAC960.c 0 additions, 1 deletiondrivers/block/DAC960.c
- drivers/block/drbd/drbd_actlog.c 14 additions, 5 deletionsdrivers/block/drbd/drbd_actlog.c
- drivers/block/drbd/drbd_bitmap.c 5 additions, 5 deletionsdrivers/block/drbd/drbd_bitmap.c
- drivers/block/drbd/drbd_int.h 11 additions, 1 deletiondrivers/block/drbd/drbd_int.h
- drivers/block/drbd/drbd_main.c 18 additions, 2 deletionsdrivers/block/drbd/drbd_main.c
- drivers/block/drbd/drbd_nl.c 22 additions, 22 deletionsdrivers/block/drbd/drbd_nl.c
- drivers/block/drbd/drbd_receiver.c 28 additions, 6 deletionsdrivers/block/drbd/drbd_receiver.c
- drivers/block/drbd/drbd_worker.c 12 additions, 6 deletionsdrivers/block/drbd/drbd_worker.c
- drivers/block/loop.c 2 additions, 0 deletionsdrivers/block/loop.c
- drivers/block/paride/pcd.c 2 additions, 2 deletionsdrivers/block/paride/pcd.c
- drivers/block/paride/pf.c 2 additions, 2 deletionsdrivers/block/paride/pf.c
- drivers/block/paride/pt.c 2 additions, 2 deletionsdrivers/block/paride/pt.c
- drivers/block/virtio_blk.c 2 additions, 3 deletionsdrivers/block/virtio_blk.c
Loading
Please register or sign in to comment