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

Commit 2e1f44f6 authored by James Bottomley's avatar James Bottomley
Browse files

Merge branch 'fixes' into misc 



Somewhat nasty merge due to conflicts between "33b28357 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b9647
scsi: qla2xxx: Fix FC-NVMe LUN discovery"

Merge is non-trivial and has been verified by Qlogic (Cavium)

Signed-off-by: default avatarJames E.J. Bottomley <jejb@linux.vnet.ibm.com>
parents ad448378 3f6c9be2

drivers/message/fusion/mptctl.c

+2 −0
Original line number Diff line number Diff line
@@ -2687,6 +2687,8 @@ mptctl_hp_targetinfo(unsigned long arg) 
				__FILE__, __LINE__, iocnum);

		return -ENODEV;

	}

	if (karg.hdr.id >= MPT_MAX_FC_DEVICES)

		return -EINVAL;

	dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "mptctl_hp_targetinfo called.\n",

	    ioc->name));

drivers/scsi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ 
CFLAGS_ncr53c8xx.o	:= $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)

zalon7xx-objs	:= zalon.o ncr53c8xx.o

NCR_Q720_mod-objs	:= NCR_Q720.o ncr53c8xx.o

oktagon_esp_mod-objs	:= oktagon_esp.o oktagon_io.o



# Files generated that shall be removed upon make clean

clean-files :=	53c700_d.h 53c700_u.h

drivers/scsi/aacraid/linit.c

+3 −1
Original line number Diff line number Diff line
@@ -1693,8 +1693,10 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	 *	Map in the registers from the adapter.

	 */

	aac->base_size = AAC_MIN_FOOTPRINT_SIZE;

	if ((*aac_drivers[index].init)(aac))

	if ((*aac_drivers[index].init)(aac)) {

		error = -ENODEV;

		goto out_unmap;

	}



	if (aac->sync_mode) {

		if (aac_sync_mode)

drivers/scsi/aic7xxx/aiclib.c

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * Implementation of Utility functions for all SCSI device types.

 *

 * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.

 * Copyright (c) 1997, 1998 Kenneth D. Merry.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions, and the following disclaimer,

 *    without modification, immediately at the beginning of the file.

 * 2. The name of the author may not be used to endorse or promote products

 *    derived from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR

 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 *

 * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.38 2002/09/23 04:56:35 mjacob Exp $

 * $Id$

 */



#include "aiclib.h"

drivers/scsi/bnx2fc/bnx2fc_io.c

+1 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, 
		/* we will not receive ABTS response for this IO */

		BNX2FC_IO_DBG(io_req, "Timer context finished processing "

			   "this scsi cmd\n");

		return;

	}



	/* Cancel the timeout_work, as we received IO completion */