Linus Torvalds
2f9e825d3e
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
...
* 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits)
block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
xen-blkfront: fix missing out label
blkdev: fix blkdev_issue_zeroout return value
block: update request stacking methods to support discards
block: fix missing export of blk_types.h
writeback: fix bad _bh spinlock nesting
drbd: revert "delay probes", feature is being re-implemented differently
drbd: Initialize all members of sync_conf to their defaults [Bugz 315]
drbd: Disable delay probes for the upcomming release
writeback: cleanup bdi_register
writeback: add new tracepoints
writeback: remove unnecessary init_timer call
writeback: optimize periodic bdi thread wakeups
writeback: prevent unnecessary bdi threads wakeups
writeback: move bdi threads exiting logic to the forker thread
writeback: restructure bdi forker loop a little
writeback: move last_active to bdi
writeback: do not remove bdi from bdi_list
writeback: simplify bdi code a little
writeback: do not lose wake-ups in bdi threads
...
Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and
drivers/scsi/scsi_error.c as per Jens.
2010-08-10 15:22:42 -07:00
..
aoe
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
drbd
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
paride
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
amiflop.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
ataflop.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
brd.c
block: push down BKL into .locked_ioctl
2010-08-07 18:25:00 +02:00
cciss.c
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
cciss.h
cciss: use consistent variable names
2010-08-07 18:52:30 +02:00
cciss_cmd.h
cciss: fix hard reset code.
2010-08-07 18:52:30 +02:00
cciss_scsi.c
cciss: change printks to dev_warn, etc.
2010-08-07 18:52:30 +02:00
cciss_scsi.h
cciss: remove C99-style comments
2010-02-22 13:44:45 +01:00
cpqarray.c
cpqarray: check put_user() result
2010-08-07 18:53:03 +02:00
cpqarray.h
cryptoloop.c
drivers: Remove unnecessary inclusions of asm/semaphore.h
2008-04-18 22:16:32 -04:00
DAC960.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
DAC960.h
Fix DAC960 driver on machines which don't support 64-bit DMA
2007-09-11 17:21:19 -07:00
floppy.c
floppy: make controller const
2010-08-07 18:52:31 +02:00
hd.c
block: remove wrappers for request type/flags
2010-08-07 18:17:56 +02:00
ida_cmd.h
ida_ioctl.h
Kconfig
paride: fix menu indentation
2010-05-11 09:02:55 +02:00
loop.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
Makefile
The DRBD driver
2009-10-01 21:17:49 +02:00
mg_disk.c
block: remove wrappers for request type/flags
2010-08-07 18:17:56 +02:00
nbd.c
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
osdblk.c
block: remove q->prepare_flush_fn completely
2010-08-07 18:24:15 +02:00
pktcdvd.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
ps3disk.c
block: remove q->prepare_flush_fn completely
2010-08-07 18:24:15 +02:00
ps3vram.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
smart1,2.h
sunvdc.c
block: Consolidate phys_segment and hw_segment limits
2010-02-26 13:58:08 +01:00
swim.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
swim3.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
swim_asm.S
m68k: mac - Add SWIM floppy support
2009-03-26 21:15:27 +01:00
sx8.c
block: Consolidate phys_segment and hw_segment limits
2010-02-26 13:58:08 +01:00
ub.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
umem.c
block: unify flags for struct bio and struct request
2010-08-07 18:20:39 +02:00
umem.h
drivers/block/umem: trim trailing whitespace
2007-10-10 09:25:59 +02:00
viodasd.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
virtio_blk.c
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
xd.c
block: push down BKL into .locked_ioctl
2010-08-07 18:25:00 +02:00
xd.h
[PATCH] switch xd
2008-10-21 07:48:11 -04:00
xen-blkfront.c
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
xsysace.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
z2ram.c
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00