Commit 52998cdd authored Jan 22, 2024 by Martin K. Petersen

Merge branch '6.8/scsi-staging' into 6.8/scsi-fixes



Pull in staged fixes for 6.8.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parents 6613476e 7d1ae55f

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -10282,7 +10282,7 @@ F: drivers/scsi/ibmvscsi/ibmvscsi*
		F: include/scsi/viosrp.h

		IBM Power Virtual SCSI Device Target Driver
		M: Michael Cyr <mikecyr@linux.ibm.com>
		M: Tyrel Datwyler <tyreld@linux.ibm.com>
		L: linux-scsi@vger.kernel.org
		L: target-devel@vger.kernel.org
		S: Supported

drivers/scsi/initio.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -371,7 +371,6 @@ static u16 initio_se2_rd(unsigned long base, u8 addr)
		*/
		static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
		{
		u8 rb;
		u8 instr;
		int i;

		@@ -400,7 +399,7 @@ static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
		udelay(30);
		outb(SE2CS, base + TUL_NVRAM); /* -CLK */
		udelay(30);
		if ((rb = inb(base + TUL_NVRAM)) & SE2DI)
		if (inb(base + TUL_NVRAM) & SE2DI)
		break; /* write complete */
		}
		outb(0, base + TUL_NVRAM); /* -CS */

drivers/scsi/isci/request.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3387,7 +3387,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost,
		return SCI_FAILURE;
		}

		return SCI_SUCCESS;
		return status;
		}

		static struct isci_request isci_request_from_tag(struct isci_host ihost, u16 tag)

drivers/scsi/virtio_scsi.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -188,8 +188,6 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi,
		while ((buf = virtqueue_get_buf(vq, &len)) != NULL)
		fn(vscsi, buf);

		if (unlikely(virtqueue_is_broken(vq)))
		break;
		} while (!virtqueue_enable_cb(vq));
		spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);
		}