Jeff Garzik 8407884dd9 Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream ...

Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h

2012-07-25 15:58:48 -04:00

..

fc

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2012-03-22 12:55:29 -07:00

fc_encode.h

[SCSI] libfc: Add support for FDMI

2012-02-19 08:08:58 -06:00

fc_frame.h

[SCSI] fcoe: remove unused ptype field in fcoe_rcv_info

2011-07-28 12:08:55 +04:00

fcoe_sysfs.h

[SCSI] libfcoe: Add fcoe_sysfs

2012-05-23 09:40:09 +01:00

iscsi_if.h

[SCSI] qla4xxx: Removed packed attr from struct iscsi_chap_rec

2012-03-27 08:26:35 +01:00

iscsi_proto.h

[SCSI] be2iscsi: Get Initiator Name for the iSCSI_Host

2012-04-25 09:29:35 +01:00

Kbuild

[SCSI] Unexport scsi/scsi.h from headers_install

2010-05-02 11:45:12 -04:00

libfc.h

[SCSI] libfc: update fcp and exch stats

2012-07-20 08:31:48 +01:00

libfcoe.h

[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs

2012-05-23 09:43:13 +01:00

libiscsi_tcp.h

[SCSI] libiscsi_tcp: fix max_r2t manipulation

2012-02-19 08:09:00 -06:00

libiscsi.h

[SCSI] libiscsi_tcp: fix max_r2t manipulation

2012-02-19 08:09:00 -06:00

libsas.h

[SCSI] libsas: trim sas_task of slow path infrastructure

2012-07-20 08:58:54 +01:00

libsrp.h

libsrp: fix compile failure

2009-12-30 12:23:27 -08:00

osd_attributes.h

[SCSI] libosd: OSD2r05: Attribute definitions

2009-06-10 08:54:07 -05:00

osd_initiator.h

treewide: Fix recieve/receive typos

2011-06-24 11:18:57 +02:00

osd_ore.h

BUG: headers with BUG/BUG_ON etc. need linux/bug.h

2012-03-04 17:54:34 -05:00

osd_protocol.h

[SCSI] libosd: Support for scatter gather write/read commands

2010-10-26 10:42:34 -05:00

osd_sec.h

…

osd_sense.h

[SCSI] libosd: osd_sense: OSD_CFO_PERMISSIONS

2009-12-04 12:01:44 -06:00

osd_types.h

[SCSI] libosd: Support for scatter gather write/read commands

2010-10-26 10:42:34 -05:00

sas_ata.h

[SCSI] libata, libsas: introduce sched_eh and end_eh port ops

2012-07-20 08:58:45 +01:00

sas.h

isci: kill sci_phy_protocol and sci_request_protocol

2012-05-17 12:27:11 -07:00

scsi_bsg_fc.h

[SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.

2010-01-17 12:36:33 -06:00

scsi_bsg_iscsi.h

[SCSI] iscsi class: add bsg support to iscsi class

2011-08-27 08:36:21 -06:00

scsi_cmnd.h

[SCSI] Fix NULL dereferences in scsi_cmd_to_driver

2012-07-08 09:40:51 +01:00

scsi_dbg.h

…

scsi_device.h

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

2012-07-25 15:58:48 -04:00

scsi_devinfo.h

…

scsi_dh.h

[SCSI] scsi_dh: add scsi_dh_attached_handler_name

2012-07-20 08:58:42 +01:00

scsi_driver.h

[SCSI] Handle disk devices which can not process medium access commands

2012-02-19 10:14:52 -06:00

scsi_eh.h

…

scsi_host.h

[SCSI] add flag to skip the runtime PM calls on the host

2012-01-08 19:14:57 -05:00

scsi_ioctl.h

…

scsi_netlink_fc.h

…

scsi_netlink.h

headers: include linux/types.h where appropriate

2012-03-23 16:58:31 -07:00

scsi_tcq.h

[SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions

2011-05-24 13:03:56 -04:00

scsi_tgt_if.h

…

scsi_tgt.h

…

scsi_transport_fc.h

[SCSI] fc: add some more FC specific stats to fc_host

2012-07-20 08:31:47 +01:00

scsi_transport_iscsi.h

[SCSI] iscsi_transport: Add support to display CHAP list and delete CHAP entry

2012-02-29 16:55:59 -06:00

scsi_transport_sas.h

[SCSI] libsas: fix sas_find_local_phy(), take phy references

2012-02-29 13:01:06 -06:00

scsi_transport_spi.h

[SCSI] aic79xx: make driver respect nvram for IU and QAS settings

2009-06-15 10:09:35 -05:00

scsi_transport_srp.h

…

scsi_transport.h

BUG: headers with BUG/BUG_ON etc. need linux/bug.h

2012-03-04 17:54:34 -05:00

scsi.h

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

2012-07-25 15:58:48 -04:00

scsicam.h

…

sg.h

sysctl extern cleanup: sg

2010-03-12 15:53:10 -08:00

srp.h

IB/srp: Implement SRP_CRED_REQ and SRP_AER_REQ

2010-10-22 22:19:10 -07:00