2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 04:03:58 +08:00
linux-next/drivers/scsi/mpt2sas
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
..
mpi [SCSI] mpt2sas: Revision P MPI Header Update 2011-01-24 09:32:18 -06:00
Kconfig [SCSI] mpt2sas: Copyright 2010. 2010-04-11 09:24:02 -05:00
Makefile [SCSI] mpt2sas v00.100.11.15 2009-03-13 16:08:49 -05:00
mpt2sas_base.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2011-03-17 17:54:40 -07:00
mpt2sas_base.h [SCSI] mpt2sas: Bump version 08.100.00.00 2011-01-24 09:35:12 -06:00
mpt2sas_config.c [SCSI] mpt2sas: driver fails to recover from injected PCIe bus errors 2010-07-27 12:04:03 -05:00
mpt2sas_ctl.c [SCSI] mpt2sas: Removed compiler warnnings when logging is disabled 2010-12-21 12:24:02 -06:00
mpt2sas_ctl.h [SCSI] mpt2sas: Copyright 2010. 2010-04-11 09:24:02 -05:00
mpt2sas_debug.h [SCSI] mpt2sas: Copyright 2010. 2010-04-11 09:24:02 -05:00
mpt2sas_scsih.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2011-03-17 17:54:40 -07:00
mpt2sas_transport.c [SCSI] mpt2sas: Modify code to support Expander switch 2010-12-21 12:24:05 -06:00