Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4f58ff 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 misc update from James Bottomley:
 "The patch contains the usual assortment of driver updates (be2iscsi,
  bfa, bnx2i, fcoe, hpsa, isci, lpfc, megaraid, mpt2sas, pm8001, sg)
  plus an assortment of other changes and fixes.  Also new is the fact
  that the isci update is delivered as a git merge (with signed tag)."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (158 commits)
  isci: End the RNC resumption wait when the RNC is destroyed.
  isci: Fixed RNC bug that lost the suspension or resumption during destroy
  isci: Fix RNC AWAIT_SUSPENSION->INVALIDATING transition.
  isci: Manage the IREQ_NO_AUTO_FREE_TAG under scic_lock.
  isci: Remove obviated host callback list.
  isci: Check IDEV_GONE before performing abort path operations.
  isci: Restore the ATAPI device RNC management code.
  isci: Don't wait for an RNC suspend if it's being destroyed.
  isci: Change the phy control and link reset interface for HW reasons.
  isci: Added timeouts to RNC suspensions in the abort path.
  isci: Add protocol indicator for TMF requests.
  isci: Directly control IREQ_ABORT_PATH_ACTIVE when completing TMFs.
  isci: Wait for RNC resumption before leaving the abort path.
  isci: Fix RNC suspend call for SCI_RESUMING state.
  isci: Manage tag releases differently when aborting tasks.
  isci: Callbacks to libsas occur under scic_lock and are synchronized.
  isci: When in the abort path, defeat other resume calls until done.
  isci: Implement waiting for suspend in the abort path.
  isci: Make sure all TCs are terminated and cleaned in LUN reset.
  isci: Manage the LLHANG timer enable/disable per-device.
  ...
parents ba01a87e e3469333

Documentation/scsi/ChangeLog.megaraid_sas

+8 −0
Original line number Diff line number Diff line 
Release Date    : Mon. Mar 19, 2012 17:00:00 PST 2012 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

Current Version : 00.00.06.15-rc1

Old Version     : 00.00.06.14-rc1

    1. Optimize HostMSIxVectors setting.

    2. Add fpRead/WriteCapable, fpRead/WriteAcrossStripe checks.

-------------------------------------------------------------------------------

Release Date    : Fri. Jan 6, 2012 17:00:00 PST 2010 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,7 @@ F: include/linux/bcma/ 


BROCADE BFA FC SCSI DRIVER

M:	Jing Huang <huangj@brocade.com>

M:	Krishna C Gudipati <kgudipat@brocade.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/bfa/
@@ -6882,6 +6883,14 @@ F: Documentation/cdrom/ 
F:	drivers/cdrom/cdrom.c

F:	include/linux/cdrom.h



UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER

M:	Vinayak Holikatti <vinholikatti@gmail.com>

M:	Santosh Y <santoshsy@gmail.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/scsi/ufs.txt

F:	drivers/scsi/ufs/



UNSORTED BLOCK IMAGES (UBI)

M:	Artem Bityutskiy <dedekind1@gmail.com>

W:	http://www.linux-mtd.infradead.org/

drivers/scsi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ config BLK_DEV_3W_XXXX_RAID 
config SCSI_HPSA

	tristate "HP Smart Array SCSI driver"

	depends on PCI && SCSI

	select CHECK_SIGNATURE

	help

	  This driver supports HP Smart Array Controllers (circa 2009).

	  It is a SCSI alternative to the cciss driver, which is a block

drivers/scsi/aacraid/src.c

+2 −0
Original line number Diff line number Diff line
@@ -424,6 +424,8 @@ static int aac_src_deliver_message(struct fib *fib) 
static int aac_src_ioremap(struct aac_dev *dev, u32 size)

{

	if (!size) {

		iounmap(dev->regs.src.bar1);

		dev->regs.src.bar1 = NULL;

		iounmap(dev->regs.src.bar0);

		dev->base = dev->regs.src.bar0 = NULL;

		return 0;

drivers/scsi/be2iscsi/be.h

+0 −4
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ struct be_ctrl_info { 
		((u32)((((size_t)(_address) & (PAGE_SIZE_4K - 1)) +	\

			(size) + (PAGE_SIZE_4K - 1)) >> PAGE_SHIFT_4K))



/* Byte offset into the page corresponding to given address */

#define OFFSET_IN_PAGE(addr)						\

		((size_t)(addr) & (PAGE_SIZE_4K-1))



/* Returns bit offset within a DWORD of a bitfield */

#define AMAP_BIT_OFFSET(_struct, field)					\

		(((size_t)&(((_struct *)0)->field))%32)