b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Xose Vazquez Perez <xose.vazquez@gmail.com>
|
|
Date: Wed, 16 Dec 2020 23:17:40 +0100
|
|
Subject: [PATCH] multipath-tools: Violin and Nexsan were bought by StorCentric
|
|
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
Cc: Martin Wilck <mwilck@suse.com>
|
|
Cc: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
|
|
Cc: DM-DEVEL ML <dm-devel@redhat.com>
|
|
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/hwtable.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
|
|
index c1d6f7ae..a54cc0a3 100644
|
|
--- a/libmultipath/hwtable.c
|
|
+++ b/libmultipath/hwtable.c
|
|
@@ -1113,8 +1113,9 @@ static struct hwentry default_hw[] = {
|
|
.pgpolicy = MULTIBUS,
|
|
},
|
|
/*
|
|
- * Imation/Nexsan
|
|
+ * StorCentric
|
|
*/
|
|
+ /* Nexsan */
|
|
{
|
|
/* E-Series */
|
|
.vendor = "NEXSAN",
|
|
@@ -1143,9 +1144,7 @@ static struct hwentry default_hw[] = {
|
|
.prio_name = PRIO_ALUA,
|
|
.no_path_retry = 30,
|
|
},
|
|
- /*
|
|
- * Violin Systems
|
|
- */
|
|
+ /* Violin Systems */
|
|
{
|
|
/* 3000 / 6000 Series */
|
|
.vendor = "VIOLIN",
|