merge block&ROW improvements

_________________________________________________________
block: Add support for reinsert a dispatched req
block: Add API for urgent request handling
row: Adding support for reinsert already dispatched req
row: Add support for urgent request handling
block: row: Add some debug information on ROW queues
block: row: Insert dispatch_quantum into struct row_queue
block: row: fix sysfs functions - idle_time conversion
block: row: Aggregate row_queue parameters to one structure

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
_________________________________________________________
iosched: prevent aliased requests from starving other I/O

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
_________________________________________________________
block: reorganize queue draining
block: reorder elevator switch sequence
block: remove elevator_queue->ops

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
_________________________________________________________
cifs: fix silence compiler warnings showing up with gcc-4.7+

gcc-4.7.0 has started throwing these warnings when building cifs.ko.

CC [M]  fs/cifs/cifssmb.o
fs/cifs/cifssmb.c: In function ‘CIFSSMBSetCIFSACL’:
fs/cifs/cifssmb.c:3905:9: warning: array subscript is above array bounds [-Warray-bounds]
fs/cifs/cifssmb.c: In function ‘CIFSSMBSetFileInfo’:
fs/cifs/cifssmb.c:5711:8: warning: array subscript is above array bounds [-Warray-bounds]
fs/cifs/cifssmb.c: In function ‘CIFSSMBUnixSetFileInfo’:
fs/cifs/cifssmb.c:6001:25: warning: array subscript is above array bounds [-Warray-bounds]

This patch cleans up the code a bit by using the offsetof macro instead
of the funky "&pSMB->hdr.Protocol" construct.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Revert "block: introduce the BFQ-v5r1 I/O sched for 3.0"

This reverts commit d87c81bbfdc3ab3e1abc01a1e3e22ed7f7d545f3.
Revert "block: prepare I/O context code for BFQ-v5r1 for 3.0"

This reverts commit 8e4e4eb745e60591c468c574101f0b61b225a7a2.

Conflicts:
	block/Kconfig.iosched
Revert "block: cgroups, kconfig, build bits for BFQ-v5r1-3.0"

This reverts commit 3073ad197ebf37177c6907136c54ee7e6d40f25e.

Conflicts:
	block/Makefile
defconfig: remove bfq config