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

Commit d4e06701 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: (77 commits)
  [SCSI] fix crash in scsi_dispatch_cmd()
  [SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
  [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu
  [SCSI] bfa: Update the driver version to 3.0.2.1
  [SCSI] bfa: Driver and BSG enhancements.
  [SCSI] bfa: Added support to query PHY.
  [SCSI] bfa: Added HBA diagnostics support.
  [SCSI] bfa: Added support for flash configuration
  [SCSI] bfa: Added support to obtain SFP info.
  [SCSI] bfa: Added support for CEE info and stats query.
  [SCSI] bfa: Extend BSG interface.
  [SCSI] bfa: FCS bug fixes.
  [SCSI] bfa: DMA memory allocation enhancement.
  [SCSI] bfa: Brocade-1860 Fabric Adapter vHBA support.
  [SCSI] bfa: Brocade-1860 Fabric Adapter PLL init fixes.
  [SCSI] bfa: Added Fabric Assigned Address(FAA) support
  [SCSI] bfa: IOC bug fixes.
  [SCSI] bfa: Enable ASIC block configuration and query.
  [SCSI] bnx2i: Updated copyright and bump version
  [SCSI] bnx2i: Modified to skip CNIC registration if iSCSI is not supported
  ...

Fix up some trivial conflicts in:
 - drivers/scsi/bnx2fc/{bnx2fc.h,bnx2fc_fcoe.c}:
	Crazy broadcom version number conflicts
 - drivers/target/tcm_fc/tfc_cmd.c
	Just trivial cleanups done on adjacent lines
parents e4980371 87045b03

MAINTAINERS

+8 −1
Original line number Original line Diff line number Diff line
@@ -1553,6 +1553,12 @@ L: linux-wireless@vger.kernel.org 
S:	Supported

S:	Supported

F:	drivers/staging/brcm80211/

F:	drivers/staging/brcm80211/





BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER

M:	Bhanu Prakash Gollapudi <bprakash@broadcom.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/bnx2fc/



BROCADE BFA FC SCSI DRIVER

BROCADE BFA FC SCSI DRIVER

M:	Jing Huang <huangj@brocade.com>

M:	Jing Huang <huangj@brocade.com>

L:	linux-scsi@vger.kernel.org

L:	linux-scsi@vger.kernel.org
@@ -1775,7 +1781,8 @@ F: include/linux/clk.h 




CISCO FCOE HBA DRIVER

CISCO FCOE HBA DRIVER

M:	Abhijeet Joglekar <abjoglek@cisco.com>

M:	Abhijeet Joglekar <abjoglek@cisco.com>

M:	Joe Eykholt <jeykholt@cisco.com>

M:	Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com>

M:	Brian Uchino <buchino@cisco.com>

L:	linux-scsi@vger.kernel.org

L:	linux-scsi@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/scsi/fnic/

F:	drivers/scsi/fnic/

block/blk-core.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -839,6 +839,9 @@ struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask) 
{

{

	struct request *rq;

	struct request *rq;





	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)))

		return NULL;



	BUG_ON(rw != READ && rw != WRITE);

	BUG_ON(rw != READ && rw != WRITE);





	spin_lock_irq(q->queue_lock);

	spin_lock_irq(q->queue_lock);

block/blk-exec.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,13 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, 
{

{

	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;

	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;





	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {

		rq->errors = -ENXIO;

		if (rq->end_io)

			rq->end_io(rq, rq->errors);

		return;

	}



	rq->rq_disk = bd_disk;

	rq->rq_disk = bd_disk;

	rq->end_io = done;

	rq->end_io = done;

	WARN_ON(irqs_disabled());

	WARN_ON(irqs_disabled());

drivers/firmware/iscsi_ibft.c

+11 −3
Original line number Original line Diff line number Diff line
@@ -566,6 +566,11 @@ static mode_t __init ibft_check_initiator_for(void *data, int type) 
	return rc;

	return rc;

}

}





static void ibft_kobj_release(void *data)

{

	kfree(data);

}



/*

/*

 * Helper function for ibft_register_kobjects.

 * Helper function for ibft_register_kobjects.

 */

 */
@@ -595,7 +600,8 @@ static int __init ibft_create_kobject(struct acpi_table_ibft *header, 
		boot_kobj = iscsi_boot_create_initiator(boot_kset, hdr->index,

		boot_kobj = iscsi_boot_create_initiator(boot_kset, hdr->index,

						ibft_kobj,

						ibft_kobj,

						ibft_attr_show_initiator,

						ibft_attr_show_initiator,

						ibft_check_initiator_for);

						ibft_check_initiator_for,

						ibft_kobj_release);

		if (!boot_kobj) {

		if (!boot_kobj) {

			rc = -ENOMEM;

			rc = -ENOMEM;

			goto free_ibft_obj;

			goto free_ibft_obj;
@@ -610,7 +616,8 @@ static int __init ibft_create_kobject(struct acpi_table_ibft *header, 
		boot_kobj = iscsi_boot_create_ethernet(boot_kset, hdr->index,

		boot_kobj = iscsi_boot_create_ethernet(boot_kset, hdr->index,

						       ibft_kobj,

						       ibft_kobj,

						       ibft_attr_show_nic,

						       ibft_attr_show_nic,

						       ibft_check_nic_for);

						       ibft_check_nic_for,

						       ibft_kobj_release);

		if (!boot_kobj) {

		if (!boot_kobj) {

			rc = -ENOMEM;

			rc = -ENOMEM;

			goto free_ibft_obj;

			goto free_ibft_obj;
@@ -625,7 +632,8 @@ static int __init ibft_create_kobject(struct acpi_table_ibft *header, 
		boot_kobj = iscsi_boot_create_target(boot_kset, hdr->index,

		boot_kobj = iscsi_boot_create_target(boot_kset, hdr->index,

						     ibft_kobj,

						     ibft_kobj,

						     ibft_attr_show_target,

						     ibft_attr_show_target,

						     ibft_check_tgt_for);

						     ibft_check_tgt_for,

						     ibft_kobj_release);

		if (!boot_kobj) {

		if (!boot_kobj) {

			rc = -ENOMEM;

			rc = -ENOMEM;

			goto free_ibft_obj;

			goto free_ibft_obj;

drivers/scsi/aha152x.c

+13 −4
Original line number Original line Diff line number Diff line
@@ -422,10 +422,19 @@ MODULE_PARM_DESC(aha152x1, "parameters for second controller"); 




#ifdef __ISAPNP__

#ifdef __ISAPNP__

static struct isapnp_device_id id_table[] __devinitdata = {

static struct isapnp_device_id id_table[] __devinitdata = {

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1502), 0 },

		ISAPNP_VENDOR('A','D','P'), ISAPNP_FUNCTION(0x1505), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1505), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1510), 0 },

		ISAPNP_VENDOR('A','D','P'), ISAPNP_FUNCTION(0x1530), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1515), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1520), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x2015), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1522), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x2215), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1530), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x3015), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1532), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x3215), 0 },

	{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,	ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x6360), 0 },

	{ ISAPNP_DEVICE_SINGLE_END, }

	{ ISAPNP_DEVICE_SINGLE_END, }

};

};

MODULE_DEVICE_TABLE(isapnp, id_table);

MODULE_DEVICE_TABLE(isapnp, id_table);