Commit a3e75315 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI updates from James Bottomley:
 "First round of SCSI updates for the 4.4 merge window.

  This batch includes a couple of minor fixes, some core changes to help
  issues we're still seeing with the suspend/resume code and updates to
  lpfc and cxlflash.

  We're (actually Martin Petersen is) trying to wrangle a mpt2/mpt3sas
  merger for the merge window which will help enormously with the
  maintenance burden, so there will be another round before it closes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (56 commits)
  cxlflash: Fix to avoid bypassing context cleanup
  cxlflash: Fix to avoid lock instrumentation rejection
  cxlflash: Fix to avoid corrupting port selection mask
  cxlflash: Fix to escalate to LINK_RESET on login timeout
  cxlflash: Fix to avoid leaving dangling interrupt resources
  cxlflash: Fix to avoid potential deadlock on EEH
  cxlflash: Correct trace string
  cxlflash: Fix to avoid corrupting adapter fops
  cxlflash: Fix to double the delay each time
  MAINTAINERS: Add cxlflash driver
  cxlflash: Fix to prevent stale AFU RRQ
  cxlflash: Correct spelling, grammar, and alignment mistakes
  cxlflash: Fix to prevent EEH recovery failure
  cxlflash: Fix MMIO and endianness errors
  cxlflash: Fix function prolog parameters and return codes
  cxlflash: Remove unnecessary scsi_block_requests
  cxlflash: Correct behavior in device reset handler following EEH
  cxlflash: Fix to prevent workq from accessing freed memory
  cxlflash: Correct usage of scsi_host_put()
  cxlflash: Fix AFU version access/storage and add check
  ...
parents 39cf7c39 a82544c7

MAINTAINERS

+11 −2
Original line number Diff line number Diff line
@@ -3186,6 +3186,15 @@ F: Documentation/powerpc/cxl.txt 
F:	Documentation/powerpc/cxl.txt

F:	Documentation/ABI/testing/sysfs-class-cxl



CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER

M:	Manoj N. Kumar <manoj@linux.vnet.ibm.com>

M:	Matthew R. Ochs <mrochs@linux.vnet.ibm.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/cxlflash/

F:	include/uapi/scsi/cxlflash_ioctls.h

F:	Documentation/powerpc/cxlflash.txt



STMMAC ETHERNET DRIVER

M:	Giuseppe Cavallaro <peppe.cavallaro@st.com>

L:	netdev@vger.kernel.org
@@ -9473,8 +9482,8 @@ F: include/uapi/linux/phantom.h 


SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>

M:	Minh Tran <minh.tran@avagotech.com>

M:	John Soni Jose <sony.john-n@avagotech.com>

M:	Ketan Mukadam <ketan.mukadam@avagotech.com>

M:	John Soni Jose <sony.john@avagotech.com>

L:	linux-scsi@vger.kernel.org

W:	http://www.avagotech.com

S:	Supported

drivers/scsi/be2iscsi/Kconfig

+2 −2
Original line number Diff line number Diff line 
config BE2ISCSI

	tristate "ServerEngines' 10Gbps iSCSI - BladeEngine 2"

	tristate "Emulex 10Gbps iSCSI - BladeEngine 2"

	depends on PCI && SCSI && NET

	select SCSI_ISCSI_ATTRS

	select ISCSI_BOOT_SYSFS



	help

	This driver implements the iSCSI functionality for ServerEngines'

	This driver implements the iSCSI functionality for Emulex

	10Gbps Storage adapter - BladeEngine 2.

drivers/scsi/be2iscsi/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Makefile to build the iSCSI driver for ServerEngine's BladeEngine.

# Makefile to build the iSCSI driver for Emulex OneConnect.

#

#

drivers/scsi/be2iscsi/be.h

+2 −2
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2005 - 2015 Avago Technologies

 * Copyright (C) 2005 - 2015 Emulex

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -10,7 +10,7 @@ 
 * Contact Information:

 * linux-drivers@avagotech.com

 *

 * Avago Technologies

 * Emulex

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 */

drivers/scsi/be2iscsi/be_cmds.c

+2 −2
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2005 - 2015 Avago Technologies

 * Copyright (C) 2005 - 2015 Emulex

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -10,7 +10,7 @@ 
 * Contact Information:

 * linux-drivers@avagotech.com

 *

 * Avago Technologies

 * Emulex

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE