You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds c9059598ea Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block ... * 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block: (153 commits) block: add request clone interface (v2) floppy: fix hibernation ramdisk: remove long-deprecated "ramdisk=" boot-time parameter fs/bio.c: add missing __user annotation block: prevent possible io_context->refcount overflow Add serial number support for virtio_blk, V4a block: Add missing bounce_pfn stacking and fix comments Revert "block: Fix bounce limit setting in DM" cciss: decode unit attention in SCSI error handling code cciss: Remove no longer needed sendcmd reject processing code cciss: change SCSI error handling routines to work with interrupts enabled. cciss: separate error processing and command retrying code in sendcmd_withirq_core() cciss: factor out fix target status processing code from sendcmd functions cciss: simplify interface of sendcmd() and sendcmd_withirq() cciss: factor out core of sendcmd_withirq() for use by SCSI error handling code cciss: Use schedule_timeout_uninterruptible in SCSI error handling code block: needs to set the residual length of a bidi request Revert "block: implement blkdev_readpages" block: Fix bounce limit setting in DM Removed reference to non-existing file Documentation/PCI/PCI-DMA-mapping.txt ... Manually fix conflicts with tracing updates in: block/blk-sysfs.c drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c include/trace/events/block.h kernel/trace/blktrace.c		16 years ago
..
fc	[SCSI] libfc: Fix compilation warnings with allmodconfig	16 years ago
fc_encode.h	[SCSI] libfc: A modular Fibre Channel library	16 years ago
fc_frame.h	[SCSI] libfc: add support of large receive offload by ddp in fc_fcp	16 years ago
iscsi_if.h	[SCSI] libiscsi_tcp: support padding offload	16 years ago
iscsi_proto.h	[SCSI] iscsi_tcp: Enable any size command	17 years ago
libfc.h	[SCSI] libfc: Track rogue remote ports	16 years ago
libfcoe.h	[SCSI] fcoe, libfcoe: Add support for FIP. FCoE discovery and keep-alive.	16 years ago
libiscsi.h	[SCSI] cxgb3i, iser, iscsi_tcp: set target can queue	16 years ago
libiscsi_tcp.h	[SCSI] iscsi_tcp: make padbuf non-static	16 years ago
libsas.h	include: Remove unnecessary inclusions of asm/semaphore.h	17 years ago
libsrp.h	[SCSI] tgt: convert libsrp and ibmvstgt to use srp_transport	18 years ago
osd_attributes.h	[SCSI] libosd: attributes Support	16 years ago
osd_initiator.h	[SCSI] libosd: SCSI/OSD Sense decoding support	16 years ago
osd_protocol.h	[SCSI] libosd: OSD2r05: on-the-wire changes for latest OSD2 revision 5.	16 years ago
osd_sec.h	[SCSI] libosd: OSDv1 Headers	16 years ago
osd_sense.h	[SCSI] libosd: SCSI/OSD Sense decoding support	16 years ago
osd_types.h	[SCSI] libosd: OSDv1 Headers	16 years ago
sas.h	[SCSI] libsas: Convert sas_proto users to sas_protocol	17 years ago
sas_ata.h	[SCSI] libsas: fix missing inlines in header file	17 years ago
scsi.h	[SCSI] Make scsi.h independent of the rest of the scsi includes	16 years ago
scsi_cmnd.h	block: convert to pos and nr_sectors accessors	16 years ago
scsi_dbg.h	[SCSI] Fix device not ready printk	18 years ago
scsi_device.h	[SCSI] remove scsi_req_map_sg	16 years ago
scsi_devinfo.h	Merge ../scsi-rc-fixes-2.6	19 years ago
scsi_dh.h	[SCSI] scsi_dh: attach to hardware handler from dm-mpath	17 years ago
scsi_driver.h	Revert "scsi: revert "[SCSI] Get rid of scsi_cmnd->done""	17 years ago
scsi_eh.h	[SCSI] scsi_eh_prep_cmnd should save scmd->underflow	17 years ago
scsi_host.h	block: unify request timeout handling	17 years ago
scsi_ioctl.h	[PATCH] don't mess with file in scsi_nonblockable_ioctl()	17 years ago
scsi_netlink.h	[SCSI] scsi_netlink: Add transport and LLD recieve and event support	17 years ago
scsi_netlink_fc.h	[SCSI] SCSI & FC transport: extend event vendor id's to 64bits	19 years ago
scsi_scan.h	PM/Hibernate: Wait for SCSI devices scan to complete during resume	16 years ago
scsi_tcq.h	scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map	17 years ago
scsi_tgt.h	[SCSI] tgt: add I_T nexus support	18 years ago
scsi_tgt_if.h	[SCSI] tgt: add I_T nexus support	18 years ago
scsi_transport.h	block: unify request timeout handling	17 years ago
scsi_transport_fc.h	[SCSI] fc-transport: Close state transition-window during rport deletion.	16 years ago
scsi_transport_iscsi.h	[SCSI] iscsi class: remove host no argument from session creation callout	16 years ago
scsi_transport_sas.h	SCSI: convert struct class_device to struct device	17 years ago
scsi_transport_spi.h	[SCSI] spi transport class: export spi_dv_pending	18 years ago
scsi_transport_srp.h	[SCSI] tgt: move tsk_mgmt_response callback to transport class	18 years ago
scsicam.h	Linux-2.6.12-rc2	20 years ago
sg.h	[SCSI] sg: Add target reset support	17 years ago
srp.h	[SCSI] srp.h: Add I/O Class values	19 years ago