Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Block: use round_jiffies_up() Add round_jiffies_up and related routines block: fix __blkdev_get() for removable devices generic-ipi: fix the smp_mb() placement blk: move blk_delete_timer call in end_that_request_last block: add timer on blkdev_dequeue_request() not elv_next_request() bio: define __BIOVEC_PHYS_MERGEABLE block: remove unused ll_new_mergeable()
Showing
- block/blk-core.c 2 additions, 2 deletionsblock/blk-core.c
- block/blk-merge.c 0 additions, 21 deletionsblock/blk-merge.c
- block/blk-timeout.c 3 additions, 17 deletionsblock/blk-timeout.c
- block/elevator.c 6 additions, 6 deletionsblock/elevator.c
- fs/block_dev.c 11 additions, 12 deletionsfs/block_dev.c
- include/linux/bio.h 5 additions, 1 deletioninclude/linux/bio.h
- include/linux/timer.h 5 additions, 0 deletionsinclude/linux/timer.h
- kernel/smp.c 12 additions, 6 deletionskernel/smp.c
- kernel/timer.c 99 additions, 30 deletionskernel/timer.c
Loading
Please register or sign in to comment