Linus Torvalds c55d267de2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}

2011-03-17 17:54:40 -07:00

..

fc

[SCSI] fc: Add GSPN_ID request to header file

2011-02-25 12:02:19 -05:00

fc_encode.h

[SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument

2011-02-28 18:32:33 -06:00

fc_frame.h

[SCSI] libfc: add fc_frame_sid() and fc_frame_did() functions

2010-07-28 09:05:59 -05:00

iscsi_if.h

[SCSI] libiscsi: add more informative failure message during iscsi scsi eh

2010-12-31 09:51:54 -06:00

iscsi_proto.h

[SCSI] libiscsi: Check TMF state before sending PDU

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

Kbuild

[SCSI] Unexport scsi/scsi.h from headers_install

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

libfc.h

[SCSI] libfc: introduce LLD event callback

2011-02-12 11:09:04 -06:00

libfcoe.h

[SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h

2011-02-28 18:33:12 -06:00

libiscsi_tcp.h

kfifo: move struct kfifo in place

2009-12-22 14:17:55 -08:00

libiscsi.h

[SCSI] cxgbi: convert to use iscsi_conn_get_addr_param

2011-02-24 12:41:15 -05:00

libsas.h

[SCSI] libsas: fix definition of wideport, include local sas address

2010-12-21 12:23:53 -06: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

[SCSI] libosd: write/read_sg_kern API

2010-10-26 10:42:35 -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

[SCSI] libosd: OSDv1 Headers

2009-03-12 12:58:06 -05:00

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

libsas: convert to libata new error handler

2011-03-02 02:36:45 -05:00

sas.h

[SCSI] libsas: Convert sas_proto users to sas_protocol

2008-01-11 18:22:41 -06: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_cmnd.h

[SCSI] Deprecate SCSI_PROT_*_CONVERT operations

2009-10-02 09:46:25 -05:00

scsi_dbg.h

[SCSI] Fix device not ready printk

2007-10-12 14:51:56 -04:00

scsi_device.h

[SCSI] scsi_dh: Use scsi_devinfo functions to do matching of device_handler tables.

2011-01-24 12:02:09 -06:00

scsi_devinfo.h

Merge ../scsi-rc-fixes-2.6

2006-04-14 15:47:45 -05:00

scsi_dh.h

[SCSI] scsi_dh: Change the scsidh_activate interface to be asynchronous

2009-12-04 12:00:46 -06:00

scsi_driver.h

sd, sr: fix Driver 'sd' needs updating message

2009-06-21 12:01:27 -05:00

scsi_eh.h

[SCSI] scsi_eh_prep_cmnd should save scmd->underflow

2008-07-26 15:14:56 -04:00

scsi_host.h

SCSI host lock push-down

2010-11-16 13:33:23 -08:00

scsi_ioctl.h

[PATCH] don't mess with file in scsi_nonblockable_ioctl()

2008-10-21 07:47:28 -04:00

scsi_netlink_fc.h

[SCSI] SCSI & FC transport: extend event vendor id's to 64bits

2006-09-02 15:35:15 -05:00

scsi_netlink.h

scsi: use __uX types for headers exported to user space

2010-08-11 08:59:01 -07:00

scsi_scan.h

PM/Hibernate: Wait for SCSI devices scan to complete during resume

2009-04-13 11:37:07 -07:00

scsi_tcq.h

block: remove spurious uses of REQ_HARDBARRIER

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

scsi_tgt_if.h

[SCSI] tgt: add I_T nexus support

2007-10-12 14:37:50 -04:00

scsi_tgt.h

[SCSI] tgt: add I_T nexus support

2007-10-12 14:37:50 -04:00

scsi_transport_fc.h

[SCSI] fc class: add fc host dev loss sysfs file

2010-10-07 17:09:44 -05:00

scsi_transport_iscsi.h

[SCSI] iscsi class: add callout to get iscsi_endpoint values

2011-02-24 12:41:12 -05:00

scsi_transport_sas.h

[SCSI] scsi_transport_sas: add support for transport layer retries (TLR)

2010-02-08 17:15:19 -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] tgt: move tsk_mgmt_response callback to transport class

2007-10-12 14:38:01 -04:00

scsi_transport.h

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

scsi.h

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

2011-03-17 17:54:40 -07:00

scsicam.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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