Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block: (43 commits) block: ensure that completion error gets properly traced blktrace: add missing probe argument to block_bio_complete block cfq: don't use atomic_t for cfq_group block cfq: don't use atomic_t for cfq_queue block: trace event block fix unassigned field block: add internal hd part table references block: fix accounting bug on cross partition merges kref: add kref_test_and_get bio-integrity: mark kintegrityd_wq highpri and CPU intensive block: make kblockd_workqueue smarter Revert "sd: implement sd_check_events()" block: Clean up exit_io_context() source code. Fix compile warnings due to missing removal of a 'ret' variable fs/block: type signature of major_to_index(int) to major_to_index(unsigned) block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p) cfq-iosched: don't check cfqg in choose_service_tree() fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors cdrom: export cdrom_check_events() sd: implement sd_check_events() sr: implement sr_check_events() ...
No related branches found
No related tags found
Showing
- Documentation/cgroups/blkio-controller.txt 27 additions, 0 deletionsDocumentation/cgroups/blkio-controller.txt
- block/blk-cgroup.c 0 additions, 4 deletionsblock/blk-cgroup.c
- block/blk-core.c 29 additions, 11 deletionsblock/blk-core.c
- block/blk-ioc.c 2 additions, 3 deletionsblock/blk-ioc.c
- block/blk-merge.c 2 additions, 1 deletionblock/blk-merge.c
- block/cfq-iosched.c 58 additions, 54 deletionsblock/cfq-iosched.c
- block/genhd.c 520 additions, 30 deletionsblock/genhd.c
- block/ioctl.c 3 additions, 2 deletionsblock/ioctl.c
- drivers/block/drbd/drbd_int.h 0 additions, 2 deletionsdrivers/block/drbd/drbd_int.h
- drivers/block/drbd/drbd_main.c 2 additions, 5 deletionsdrivers/block/drbd/drbd_main.c
- drivers/block/drbd/drbd_nl.c 36 additions, 67 deletionsdrivers/block/drbd/drbd_nl.c
- drivers/block/loop.c 1 addition, 5 deletionsdrivers/block/loop.c
- drivers/block/pktcdvd.c 8 additions, 14 deletionsdrivers/block/pktcdvd.c
- drivers/cdrom/cdrom.c 53 additions, 3 deletionsdrivers/cdrom/cdrom.c
- drivers/char/raw.c 4 additions, 10 deletionsdrivers/char/raw.c
- drivers/md/dm-table.c 11 additions, 9 deletionsdrivers/md/dm-table.c
- drivers/md/dm.c 3 additions, 3 deletionsdrivers/md/dm.c
- drivers/md/md.c 4 additions, 12 deletionsdrivers/md/md.c
- drivers/mtd/devices/block2mtd.c 5 additions, 5 deletionsdrivers/mtd/devices/block2mtd.c
- drivers/s390/block/dasd_genhd.c 1 addition, 1 deletiondrivers/s390/block/dasd_genhd.c
Loading
Please register or sign in to comment