Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-12-17 15:45:20 +0300
committerDenis Kirjanov <dkirjanov@suse.com>2019-12-17 15:45:20 +0300
commitf4ff13a11f8e675eb29245605d192fe48e318a1e (patch)
treefadd4c21a86062ac1d7f43b6d625638ee6de73c2
parent74e53dee6be53ed1a8feee140ed2ad81552ed7c6 (diff)
parent259184ddd38735488f0b3f4a552cf18862aab49e (diff)
Merge remote-tracking branch 'origin/SLE12-SP4' into SLE12-SP5
Conflicts: patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch series.conf
-rw-r--r--patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch2
-rw-r--r--patches.suse/0002-efi-Add-EFI-signature-data-types.patch6
-rw-r--r--patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch2
-rw-r--r--patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch2
-rw-r--r--patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch2
-rw-r--r--patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch2
-rw-r--r--patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch2
-rw-r--r--patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch2
-rw-r--r--patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch2
-rw-r--r--patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch2
-rw-r--r--patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch2
-rw-r--r--patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch2
-rw-r--r--patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch2
-rw-r--r--patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch2
-rw-r--r--patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch2
-rw-r--r--patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch2
-rw-r--r--patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch2
-rw-r--r--series.conf2
18 files changed, 19 insertions, 21 deletions
diff --git a/patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch b/patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch
index f6fd566617..42cbdf69c1 100644
--- a/patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch
+++ b/patches.suse/0001-scsi-qla2xxx-Ignore-NULL-pointer-in-tcm_qla2xxx_free.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 01/15] scsi: qla2xxx: Ignore NULL pointer in
tcm_qla2xxx_free_mcmd
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: f2c9ee54a56995a293efef290657d8a1d80e14ab
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
If ABTS cannot be completed in target mode, the driver attempts to free
related management command and crashes:
diff --git a/patches.suse/0002-efi-Add-EFI-signature-data-types.patch b/patches.suse/0002-efi-Add-EFI-signature-data-types.patch
index f7a9276711..bf91f4716b 100644
--- a/patches.suse/0002-efi-Add-EFI-signature-data-types.patch
+++ b/patches.suse/0002-efi-Add-EFI-signature-data-types.patch
@@ -2,10 +2,8 @@ From d3bb93449901edec76a2322d6273e061af8ccb67 Mon Sep 17 00:00:00 2001
From: Dave Howells <dhowells@redhat.com>
Date: Thu, 3 Aug 2017 16:17:45 +0100
Subject: [PATCH 2/6] efi: Add EFI signature data types
-
-Patch-mainline: Queued in subsystem maintainer repository
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git
-Git-commit: d3bb93449901edec76a2322d6273e061af8ccb67
+Patch-mainline: v5.0-rc1
+Git-commit: 5c126ba22f894427cc770240faa1bf6b02ce7aca
References: fate#314508
Add the data types that are used for containing hashes, keys and
diff --git a/patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch b/patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch
index bca06a94d0..ee91c499b8 100644
--- a/patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch
+++ b/patches.suse/0002-scsi-qla2xxx-Use-explicit-LOGO-in-target-mode.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:51 +0300
Subject: [PATCH 02/15] scsi: qla2xxx: Use explicit LOGO in target mode
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 86196a8fa8a84af1395a28ea0548f2ce6ae9bc22
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
Target makes implicit LOGO on session teardown. LOGO ELS is not send on
the wire and initiator is not aware that target no longer wants talking
diff --git a/patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch b/patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch
index ea059c4fb4..efa0a01ee9 100644
--- a/patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch
+++ b/patches.suse/0003-scsi-qla2xxx-Initialize-free_work-before-flushing-it.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:52 +0300
Subject: [PATCH 03/15] scsi: qla2xxx: Initialize free_work before flushing it
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 4c86b037a6db3ad2922ef3ba8a8989eb7794e040
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
Target creation triggers a new BUG_ON introduced in in 4d43d395fed12
("workqueue: Try to catch flush_work() without INIT_WORK().").
diff --git a/patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch b/patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch
index 9266657332..d91385ebf7 100644
--- a/patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch
+++ b/patches.suse/0004-scsi-qla2xxx-Drop-superfluous-INIT_WORK-of-del_work.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:53 +0300
Subject: [PATCH 04/15] scsi: qla2xxx: Drop superfluous INIT_WORK of del_work
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 600954e6f2df695434887dfc6a99a098859990cf
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
del_work is already initialized inside qla2x00_alloc_fcport, there's no
need to overwrite it. Indeed, it might prevent complete traversal of
diff --git a/patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch b/patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch
index f40a8d40b2..2de35fcc96 100644
--- a/patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch
+++ b/patches.suse/0005-scsi-qla2xxx-Change-discovery-state-before-PLOGI.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:54 +0300
Subject: [PATCH 05/15] scsi: qla2xxx: Change discovery state before PLOGI
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 58e39a2ce4be08162c0368030cdc405f7fd849aa
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
When a port sends PLOGI, discovery state should be changed to login
pending, otherwise RELOGIN_NEEDED bit is set in
diff --git a/patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch b/patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch
index a1e4208ee0..3a5cd732bb 100644
--- a/patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch
+++ b/patches.suse/0006-scsi-qla2xxx-Allow-PLOGI-in-target-mode.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:55 +0300
Subject: [PATCH 06/15] scsi: qla2xxx: Allow PLOGI in target mode
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: a9ed06d4e640a8dc978a4649ab78dac8b16d2db6
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
According to FC-LS-3 (Fibre Channel Link Services) 6.3.2.4
"N_Port Login - No Fabric present", if both parties in the point-to-point
diff --git a/patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch b/patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch
index 1249d81e7e..1fb8db4ccf 100644
--- a/patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch
+++ b/patches.suse/0007-scsi-qla2xxx-Don-t-call-qlt_async_event-twice.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:56 +0300
Subject: [PATCH 07/15] scsi: qla2xxx: Don't call qlt_async_event twice
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 2c2f4bed9b6299e6430a65a29b5d27b8763fdf25
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
MBA_PORT_UPDATE generates duplicate log lines in target mode because
qlt_async_event is called twice. Drop the calls within the case as
diff --git a/patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch b/patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch
index 21ab48e267..4ddaa1807b 100644
--- a/patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch
+++ b/patches.suse/0008-scsi-qla2xxx-Fix-PLOGI-payload-and-ELS-IOCB-dump-len.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 08/15] scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump
length
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 0334cdea1fba36fad8bdf9516f267ce01de625f7
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
The size of the buffer is hardcoded as 0x70 or 112 bytes, while the
size of ELS IOCB is 0x40 and the size of PLOGI payload returned by
diff --git a/patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch b/patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch
index 1c319706d6..eba0f17060 100644
--- a/patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch
+++ b/patches.suse/0009-scsi-qla2xxx-Configure-local-loop-for-N2N-target.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:58 +0300
Subject: [PATCH 09/15] scsi: qla2xxx: Configure local loop for N2N target
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: fd1de5830a5abaf444cc4312871e02c41e24fdc1
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
qla2x00_configure_local_loop initializes PLOGI payload for PLOGI ELS
using Get Parameters mailbox command.
diff --git a/patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch b/patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch
index 3b0c77dd74..eb8d792d88 100644
--- a/patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch
+++ b/patches.suse/0010-scsi-qla2xxx-Send-Notify-ACK-after-N2N-PLOGI.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:56:59 +0300
Subject: [PATCH 10/15] scsi: qla2xxx: Send Notify ACK after N2N PLOGI
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 5e6b01d84b9d20bcd77fc7c4733a2a4149bf220a
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
qlt_handle_login schedules session for deletion even if a login is in
progress. That causes login bouncing, i.e. a few logins are made before
diff --git a/patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch b/patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch
index a388f99b13..e37bf0fdf4 100644
--- a/patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch
+++ b/patches.suse/0011-scsi-qla2xxx-Don-t-defer-relogin-unconditonally.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:57:00 +0300
Subject: [PATCH 11/15] scsi: qla2xxx: Don't defer relogin unconditonally
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: dabc5ec915f3a2c657ecfb529cd3d4ec303a4412
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
qla2x00_configure_local_loop sets RELOGIN_NEEDED bit and calls
qla24xx_fcport_handle_login to perform the login. This bit triggers
diff --git a/patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch b/patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch
index cc6c5c2a0b..73d172e0ce 100644
--- a/patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch
+++ b/patches.suse/0012-scsi-qla2xxx-Ignore-PORT-UPDATE-after-N2N-PLOGI.patch
@@ -4,7 +4,7 @@ Date: Mon, 25 Nov 2019 19:57:01 +0300
Subject: [PATCH 12/15] scsi: qla2xxx: Ignore PORT UPDATE after N2N PLOGI
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: af22f0c7b052c5c203207f1e5ebd6aa65f87c538
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
PORT UPDATE asynchronous event is generated on the host that issues PLOGI
ELS (in the case of higher WWPN). In that case, the event shouldn't be
diff --git a/patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch b/patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch
index cf3e076f75..8dc757d719 100644
--- a/patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch
+++ b/patches.suse/0013-scsi-qla2xxx-Add-debug-dump-of-LOGO-payload-and-ELS-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 13/15] scsi: qla2xxx: Add debug dump of LOGO payload and ELS
IOCB
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
Git-commit: 9545767db3cde2d4f9ca581d096d97ed00754282
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
The change adds a way to debug LOGO ELS, likewise PLOGI.
diff --git a/patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch b/patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch
index e2d7023851..1cd03ae96f 100644
--- a/patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch
+++ b/patches.suse/scsi-qla2xxx-Added-support-for-MPI-and-PEP-regions-f.patch
@@ -1,7 +1,7 @@
From: Michael Hernandez <mhernandez@marvell.com>
Date: Tue, 3 Dec 2019 14:36:56 -0800
Subject: scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
Git-commit: a530bf691f0e4691214562c165e6c8889dc51e57
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
diff --git a/patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch b/patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch
index c0c68c9484..d8c7b795db 100644
--- a/patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch
+++ b/patches.suse/scsi-qla2xxx-Correctly-retrieve-and-interpret-active.patch
@@ -1,7 +1,7 @@
From: Himanshu Madhani <hmadhani@marvell.com>
Date: Tue, 3 Dec 2019 14:36:55 -0800
Subject: scsi: qla2xxx: Correctly retrieve and interpret active flash region
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
Git-commit: 4e71dcae0c4cd1e9d19b8b3d80214a4bcdca5a42
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
diff --git a/patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch b/patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch
index 6a30358651..e2baeeafc5 100644
--- a/patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch
+++ b/patches.suse/scsi-qla2xxx-Fix-incorrect-SFUB-length-used-for-Secu.patch
@@ -2,7 +2,7 @@ From: Michael Hernandez <mhernandez@marvell.com>
Date: Tue, 3 Dec 2019 14:36:57 -0800
Subject: scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update
MB Cmd
-Patch-mainline: v5.5-rc2
+Patch-mainline: v5.5 or v5.5-rc2 (next release)
Git-commit: c868907e1ac6a08a17f8fa9ce482c0a496896e9e
References: bsc#1157424, bsc#1157908, bsc#1157169, bsc#1151548
diff --git a/series.conf b/series.conf
index d707e23d21..75387473f0 100644
--- a/series.conf
+++ b/series.conf
@@ -45326,6 +45326,7 @@
patches.suse/iommu-vt-d-handle-domain-agaw-being-less-than-iommu-agaw
patches.suse/iommu-amd-fix-amd_iommu-force_isolation
patches.suse/iommu-dma-use-numa-aware-memory-allocations-in-_iommu_dma_alloc_pages
+ patches.suse/0002-efi-Add-EFI-signature-data-types.patch
patches.suse/tpm-tpm_i2c_nuvoton-use-correct-command-duration-for.patch
patches.suse/tpm-tpm_try_transmit-refactor-error-flow.patch
patches.suse/tpm-fix-kdoc-for-tpm2_flush_context_cmd.patch
@@ -51741,7 +51742,6 @@
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
- patches.suse/0002-efi-Add-EFI-signature-data-types.patch
patches.suse/0003-efi-Add-an-EFI-signature-blob-parser.patch
patches.suse/0004-MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
patches.suse/0005-MODSIGN-Allow-the-db-UEFI-variable-to-be-suppressed.patch