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

Commit 4a5dacec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] mpt2sas: fix driver version inconsistency
  [SCSI] 3w-xxxx: scsi_dma_unmap fix
  [SCSI] 3w-9xxx: scsi_dma_unmap fix
  [SCSI] ses: fix problems caused by empty SES provided name
  [SCSI] fc-transport: Close state transition-window during rport deletion.
  [SCSI] initialize max_target_blocked in scsi_alloc_target
  [SCSI] fnic: Add new Cisco PCI-Express FCoE HBA
parents 3eb9c8be 2b69a8a2

MAINTAINERS

+8 −0
Original line number Original line Diff line number Diff line
@@ -1431,6 +1431,14 @@ P: Russell King 
M:	linux@arm.linux.org.uk

M:	linux@arm.linux.org.uk

F:	include/linux/clk.h

F:	include/linux/clk.h





CISCO FCOE HBA DRIVER

P:	Abhijeet Joglekar

M:	abjoglek@cisco.com

P:	Joe Eykholt

M:	jeykholt@cisco.com

L:	linux-scsi@vger.kernel.org

S:	Supported



CODA FILE SYSTEM

CODA FILE SYSTEM

P:	Jan Harkes

P:	Jan Harkes

M:	jaharkes@cs.cmu.edu

M:	jaharkes@cs.cmu.edu

drivers/misc/enclosure.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ enclosure_register(struct device *dev, const char *name, int components, 
	edev->edev.class = &enclosure_class;

	edev->edev.class = &enclosure_class;

	edev->edev.parent = get_device(dev);

	edev->edev.parent = get_device(dev);

	edev->cb = cb;

	edev->cb = cb;

	dev_set_name(&edev->edev, name);

	dev_set_name(&edev->edev, "%s", name);

	err = device_register(&edev->edev);

	err = device_register(&edev->edev);

	if (err)

	if (err)

		goto err;

		goto err;
@@ -255,8 +255,8 @@ enclosure_component_register(struct enclosure_device *edev, 
	ecomp->number = number;

	ecomp->number = number;

	cdev = &ecomp->cdev;

	cdev = &ecomp->cdev;

	cdev->parent = get_device(&edev->edev);

	cdev->parent = get_device(&edev->edev);

	if (name)

	if (name && name[0])

		dev_set_name(cdev, name);

		dev_set_name(cdev, "%s", name);

	else

	else

		dev_set_name(cdev, "%u", number);

		dev_set_name(cdev, "%u", number);

drivers/scsi/3w-9xxx.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1978,6 +1978,7 @@ static void twa_unmap_scsi_data(TW_Device_Extension *tw_dev, int request_id) 
{

{

	struct scsi_cmnd *cmd = tw_dev->srb[request_id];

	struct scsi_cmnd *cmd = tw_dev->srb[request_id];





	if (cmd->SCp.phase == TW_PHASE_SGLIST)

		scsi_dma_unmap(cmd);

		scsi_dma_unmap(cmd);

} /* End twa_unmap_scsi_data() */

} /* End twa_unmap_scsi_data() */

drivers/scsi/3w-xxxx.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
   		     Arnaldo Carvalho de Melo <acme@conectiva.com.br>

   		     Arnaldo Carvalho de Melo <acme@conectiva.com.br>

                     Brad Strand <linux@3ware.com>

                     Brad Strand <linux@3ware.com>





   Copyright (C) 1999-2007 3ware Inc.

   Copyright (C) 1999-2009 3ware Inc.





   Kernel compatiblity By: 	Andre Hedrick <andre@suse.com>

   Kernel compatiblity By: 	Andre Hedrick <andre@suse.com>

   Non-Copyright (C) 2000	Andre Hedrick <andre@suse.com>

   Non-Copyright (C) 2000	Andre Hedrick <andre@suse.com>
@@ -1294,6 +1294,7 @@ static void tw_unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd) 
{

{

	dprintk(KERN_WARNING "3w-xxxx: tw_unmap_scsi_data()\n");

	dprintk(KERN_WARNING "3w-xxxx: tw_unmap_scsi_data()\n");





	if (cmd->SCp.phase == TW_PHASE_SGLIST)

		scsi_dma_unmap(cmd);

		scsi_dma_unmap(cmd);

} /* End tw_unmap_scsi_data() */

} /* End tw_unmap_scsi_data() */

drivers/scsi/3w-xxxx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
   		     Arnaldo Carvalho de Melo <acme@conectiva.com.br>

   		     Arnaldo Carvalho de Melo <acme@conectiva.com.br>

                     Brad Strand <linux@3ware.com>

                     Brad Strand <linux@3ware.com>





   Copyright (C) 1999-2007 3ware Inc.

   Copyright (C) 1999-2009 3ware Inc.





   Kernel compatiblity By:	Andre Hedrick <andre@suse.com>

   Kernel compatiblity By:	Andre Hedrick <andre@suse.com>

   Non-Copyright (C) 2000	Andre Hedrick <andre@suse.com>

   Non-Copyright (C) 2000	Andre Hedrick <andre@suse.com>