Jens Axboe fa251f8990 Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier ...

Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

2010-10-19 09:13:04 +02:00

..

blk-cgroup.c

blkio: Fix return code for mkdir calls

2010-08-23 10:56:30 +02:00

blk-cgroup.h

blk-cgroup: config options re-arrangement

2010-04-26 19:27:56 +02:00

blk-core.c

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

2010-10-19 09:13:04 +02:00

blk-exec.c

block: remove wrappers for request type/flags

2010-08-07 18:17:56 +02:00

blk-flush.c

block: remove BLKDEV_IFL_WAIT

2010-09-16 20:52:58 +02:00

blk-integrity.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

blk-ioc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

blk-iopoll.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

blk-lib.c

block: remove BLKDEV_IFL_WAIT

2010-09-16 20:52:58 +02:00

blk-map.c

block: fix blk_rq_map_kern bio direction flag

2010-09-21 11:49:17 +02:00

blk-merge.c

block: prevent merges of discard and write requests

2010-09-25 12:42:55 +02:00

blk-settings.c

block: deprecate barrier and replace blk_queue_ordered() with blk_queue_flush()

2010-09-10 12:35:36 +02:00

blk-softirq.c

…

blk-sysfs.c

block: put dev->kobj in blk_register_queue fail path

2010-08-23 12:30:29 +02:00

blk-tag.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

blk-timeout.c

block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer

2010-04-21 17:42:08 +02:00

blk.h

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

2010-10-19 09:13:04 +02:00

bsg.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

cfq-iosched.c

cfq-iosched: fix a kernel OOPs when usb key is inserted

2010-09-21 11:49:17 +02:00

cfq.h

cfq: fix recursive call in cfq_blkiocg_update_completion_stats()

2010-06-21 09:10:55 +02:00

compat_ioctl.c

block: add secure discard

2010-08-12 08:43:30 -07:00

deadline-iosched.c

…

elevator.c

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

2010-10-19 09:13:04 +02:00

genhd.c

block: remove all rcu head initializations

2010-05-21 20:01:02 +02:00

ioctl.c

block: remove BLKDEV_IFL_WAIT

2010-09-16 20:52:58 +02:00

Kconfig

blk-cgroup: config options re-arrangement

2010-04-26 19:27:56 +02:00

Kconfig.iosched

blk-cgroup: config options re-arrangement

2010-04-26 19:27:56 +02:00

Makefile

block: rename blk-barrier.c to blk-flush.c

2010-09-10 12:35:36 +02:00

noop-iosched.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

scsi_ioctl.c

block/scsi_ioctl.c: quiet sparse noise

2009-11-04 09:10:33 +01:00