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

Commit 2152f853 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (138 commits)
  [SCSI] libata: implement minimal transport template for ->eh_timed_out
  [SCSI] eliminate rphy allocation in favour of expander/end device allocation
  [SCSI] convert mptsas over to end_device/expander allocations
  [SCSI] allow displaying and setting of cache type via sysfs
  [SCSI] add scsi_mode_select to scsi_lib.c
  [SCSI] 3ware 9000 add big endian support
  [SCSI] qla2xxx: update MAINTAINERS
  [SCSI] scsi: move target_destroy call
  [SCSI] fusion - bump version
  [SCSI] fusion - expander hotplug suport in mptsas module
  [SCSI] fusion - exposing raid components in mptsas
  [SCSI] fusion - memory leak, and initializing fields
  [SCSI] fusion - exclosure misspelled
  [SCSI] fusion - cleanup mptsas event handling functions
  [SCSI] fusion - removing target_id/bus_id from the VirtDevice structure
  [SCSI] fusion - static fix's
  [SCSI] fusion - move some debug firmware event debug msgs to verbose level
  [SCSI] fusion - loginfo header update
  [SCSI] add scsi_reprobe_device
  [SCSI] megaraid_sas: fix extended timeout handling
  ...
parents 7cae7e26 30afc84c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ S: Maintained 


QLOGIC QLA2XXX FC-SCSI DRIVER

P:	Andrew Vasquez

M:	andrew.vasquez@qlogic.com

M:	linux-driver@qlogic.com

L:	linux-scsi@vger.kernel.org

S:	Supported

drivers/base/bus.c

+22 −0
Original line number Diff line number Diff line
@@ -536,6 +536,28 @@ void bus_rescan_devices(struct bus_type * bus) 
	bus_for_each_dev(bus, NULL, NULL, bus_rescan_devices_helper);

}



/**

 * device_reprobe - remove driver for a device and probe for a new driver

 * @dev: the device to reprobe

 *

 * This function detaches the attached driver (if any) for the given

 * device and restarts the driver probing process.  It is intended

 * to use if probing criteria changed during a devices lifetime and

 * driver attachment should change accordingly.

 */

void device_reprobe(struct device *dev)

{

	if (dev->driver) {

		if (dev->parent)        /* Needed for USB */

			down(&dev->parent->sem);

		device_release_driver(dev);

		if (dev->parent)

			up(&dev->parent->sem);

	}



	bus_rescan_devices_helper(dev, NULL);

}

EXPORT_SYMBOL_GPL(device_reprobe);



struct bus_type * get_bus(struct bus_type * bus)

{

drivers/block/cciss.c

+1 −2
Original line number Diff line number Diff line
@@ -3251,7 +3251,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, 


clean4:

#ifdef CONFIG_CISS_SCSI_TAPE

	if(hba[i]->scsi_rejects.complete)

	kfree(hba[i]->scsi_rejects.complete);

#endif

	kfree(hba[i]->cmd_pool_bits);

drivers/message/fusion/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config FUSION_SPI 
	tristate "Fusion MPT ScsiHost drivers for SPI"

	depends on PCI && SCSI

	select FUSION

	select SCSI_SPI_ATTRS

	---help---

	  SCSI HOST support for a parallel SCSI host adapters.

drivers/message/fusion/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#EXTRA_CFLAGS += -DMPT_DEBUG_MSG_FRAME

#EXTRA_CFLAGS += -DMPT_DEBUG_SG

#EXTRA_CFLAGS += -DMPT_DEBUG_EVENTS

#EXTRA_CFLAGS += -DMPT_DEBUG_VERBOSE_EVENTS

#EXTRA_CFLAGS += -DMPT_DEBUG_INIT

#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT

#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL