Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: (27 commits) block: remove unused copy_io_context() Documentation: remove anticipatory scheduler info block: remove REQ_HARDBARRIER ioprio: rcu_read_lock/unlock protect find_task_by_vpid call (V2) ioprio: fix RCU locking around task dereference block: ioctl: fix information leak to userland block: read i_size with i_size_read() cciss: fix proc warning on attempt to remove non-existant directory bio: take care not overflow page count when mapping/copying user data block: limit vec count in bio_kmalloc() and bio_alloc_map_data() block: take care not to overflow when calculating total iov length block: check for proper length of iov entries in blk_rq_map_user_iov() cciss: remove controllers supported by hpsa cciss: use usleep_range not msleep for small sleeps cciss: limit commands allocated on reset_devices cciss: Use kernel provided PCI state save and restore functions cciss: fix board status waiting code drbd: Removed checks for REQ_HARDBARRIER on incomming BIOs drbd: REQ_HARDBARRIER -> REQ_FUA transition for meta data accesses drbd: Removed the BIO_RW_BARRIER support form the receiver/epoch code ...
No related branches found
No related tags found
Showing
- Documentation/block/switching-sched.txt 4 additions, 4 deletionsDocumentation/block/switching-sched.txt
- Documentation/kernel-parameters.txt 1 addition, 1 deletionDocumentation/kernel-parameters.txt
- Documentation/rbtree.txt 2 additions, 2 deletionsDocumentation/rbtree.txt
- block/blk-core.c 2 additions, 9 deletionsblock/blk-core.c
- block/blk-ioc.c 0 additions, 14 deletionsblock/blk-ioc.c
- block/blk-map.c 2 additions, 0 deletionsblock/blk-map.c
- block/compat_ioctl.c 2 additions, 2 deletionsblock/compat_ioctl.c
- block/elevator.c 2 additions, 2 deletionsblock/elevator.c
- block/ioctl.c 4 additions, 3 deletionsblock/ioctl.c
- block/scsi_ioctl.c 24 additions, 10 deletionsblock/scsi_ioctl.c
- drivers/block/aoe/aoeblk.c 0 additions, 3 deletionsdrivers/block/aoe/aoeblk.c
- drivers/block/cciss.c 61 additions, 70 deletionsdrivers/block/cciss.c
- drivers/block/cciss.h 4 additions, 0 deletionsdrivers/block/cciss.h
- drivers/block/drbd/drbd_actlog.c 23 additions, 19 deletionsdrivers/block/drbd/drbd_actlog.c
- drivers/block/drbd/drbd_int.h 24 additions, 28 deletionsdrivers/block/drbd/drbd_int.h
- drivers/block/drbd/drbd_main.c 85 additions, 63 deletionsdrivers/block/drbd/drbd_main.c
- drivers/block/drbd/drbd_nl.c 19 additions, 6 deletionsdrivers/block/drbd/drbd_nl.c
- drivers/block/drbd/drbd_proc.c 0 additions, 1 deletiondrivers/block/drbd/drbd_proc.c
- drivers/block/drbd/drbd_receiver.c 33 additions, 184 deletionsdrivers/block/drbd/drbd_receiver.c
- drivers/block/drbd/drbd_req.c 17 additions, 21 deletionsdrivers/block/drbd/drbd_req.c
Loading
Please register or sign in to comment