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

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

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: (38 commits)
  fusion: mptsas, fix lock imbalance
  [SCSI] scsi_transport_fc: replace BUS_ID_SIZE by fixed count
  sd, sr: fix Driver 'sd' needs updating message
  scsi_transport_iscsi: return -EOVERFLOW for Too many iscsi targets
  fc_transport: Selective return value from BSG timeout function
  fc_transport: The softirq_done function registration for BSG request
  sym53c8xx: ratelimit parity errors
  explain the hidden scsi_wait_scan Kconfig variable
  ibmvfc: Fix endless PRLI loop in discovery
  ibmvfc: Process async events before command responses
  libfc: Add runtime debugging with debug_logging module parameter
  libfcoe: Add runtime debugging with module param debug_logging
  fcoe: Add runtime debug logging with module parameter debug_logging
  scsi_debug: Add support for physical block exponent and alignment
  cnic: add NETDEV_1000 and NETDEVICES to Kconfig select
  cnic: Fix __symbol_get() build error.
  Revert "[SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’"
  ipr: differentiate pci-x and pci-e based adapters
  ipr: add test for MSI interrupt support
  scsi_transport_spi: Blacklist Ultrium-3 tape for IU transfers
  ...
parents defe9104 129dd981

block/bsg.c

+0 −3
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ out: 
	blk_put_request(rq);

	if (next_rq) {

		blk_rq_unmap_user(next_rq->bio);

		next_rq->bio = NULL;

		blk_put_request(next_rq);

	}

	return ERR_PTR(ret);
@@ -449,7 +448,6 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, 
		hdr->dout_resid = rq->resid_len;

		hdr->din_resid = rq->next_rq->resid_len;

		blk_rq_unmap_user(bidi_bio);

		rq->next_rq->bio = NULL;

		blk_put_request(rq->next_rq);

	} else if (rq_data_dir(rq) == READ)

		hdr->din_resid = rq->resid_len;
@@ -468,7 +466,6 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, 
	blk_rq_unmap_user(bio);

	if (rq->cmd != rq->__cmd)

		kfree(rq->cmd);

	rq->bio = NULL;

	blk_put_request(rq);



	return ret;

drivers/message/fusion/mptsas.c

+2 −2
Original line number Diff line number Diff line
@@ -3518,7 +3518,7 @@ retry_page: 
		} else

			mptsas_volume_delete(ioc, sas_info->fw.id);

	}

	mutex_lock(&ioc->sas_device_info_mutex);

	mutex_unlock(&ioc->sas_device_info_mutex);



	/* expanders */

	mutex_lock(&ioc->sas_topology_mutex);
@@ -3549,7 +3549,7 @@ retry_page: 
			goto redo_expander_scan;

		}

	}

	mutex_lock(&ioc->sas_topology_mutex);

	mutex_unlock(&ioc->sas_topology_mutex);

}



/**

drivers/net/cnic.c

+2 −4
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <linux/delay.h>

#include <linux/ethtool.h>

#include <linux/if_vlan.h>

#include <linux/module.h>



#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

#define BCM_VLAN 1

#endif
@@ -2521,9 +2519,9 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev) 
	struct cnic_dev *cdev;

	struct cnic_local *cp;

	struct cnic_eth_dev *ethdev = NULL;

	struct cnic_eth_dev *(*probe)(void *) = NULL;

	struct cnic_eth_dev *(*probe)(struct net_device *) = NULL;



	probe = __symbol_get("bnx2_cnic_probe");

	probe = symbol_get(bnx2_cnic_probe);

	if (probe) {

		ethdev = (*probe)(dev);

		symbol_put_addr(probe);

drivers/net/cnic_if.h

+2 −0
Original line number Diff line number Diff line
@@ -296,4 +296,6 @@ extern int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops); 


extern int cnic_unregister_driver(int ulp_type);



extern struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev);



#endif

drivers/scsi/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -258,10 +258,21 @@ config SCSI_SCAN_ASYNC 
	  or async on the kernel's command line.



config SCSI_WAIT_SCAN

	tristate

	tristate  # No prompt here, this is an invisible symbol.

	default m

	depends on SCSI

	depends on MODULES

# scsi_wait_scan is a loadable module which waits until all the async scans are

# complete.  The idea is to use it in initrd/ initramfs scripts.  You modprobe

# it after all the modprobes of the root SCSI drivers and it will wait until

# they have all finished scanning their buses before allowing the boot to

# proceed.  (This method is not applicable if targets boot independently in

# parallel with the initiator, or with transports with non-deterministic target

# discovery schemes, or if a transport driver does not support scsi_wait_scan.)

#

# This symbol is not exposed as a prompt because little is to be gained by

# disabling it, whereas people who accidentally switch it off may wonder why

# their mkinitrd gets into trouble.



menu "SCSI Transports"

	depends on SCSI