device-mapper-multipath-0.8.7-3

Update to the head of the upstream staging branch
  * Patches 0011 & 0012 are from the upstream staging branch
Rename redhat patches
  * Previous patches 0011-0020 are now patches 0013-0022

0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Wed, 20 Oct 2021 20:44:54 +0200
+Subject: [PATCH] Revert "multipath-tools: make EMC/Invista config work with
+ alua and multibus"
+
+This reverts commit 309ff281aaa07e862540d3d645a8263f3e9baaed.
+
+Mail from <Wayne.Berthiaume@dell.com>, 20210930:
+
+"OPM is no longer supported in the Dell VPLEX product. If we at Dell had
+wished to change the default device stanzas for any of our products they
+would have been done when the product and/or feature is released.
+Please remove this patch as well. It is not needed."
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 763982cd..211087ad 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -350,9 +350,8 @@ static struct hwentry default_hw[] = {
+ 		.vendor        = "EMC",
+ 		.product       = "Invista",
+ 		.bl_product    = "LUNZ",
+-		.pgpolicy      = GROUP_BY_PRIO,
++		.pgpolicy      = MULTIBUS,
+ 		.no_path_retry = 5,
+-		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		/* XtremIO */

0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch

@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Wed, 20 Oct 2021 20:46:09 +0200
+Subject: [PATCH] Revert "multipath-tools: make EMC/SYMMETRIX config work with
+ alua and multibus"
+
+This reverts commit 831af0dbfa171cd39d968ba6174669f11a278be9.
+
+Mail from "berthiaume, wayne" <Wayne.Berthiaume@dell.com>, 210930:
+
+"As a representative of Dell I request this patch be withdrawn. If we had
+wanted the default stanza changed we would have already implemented it.
+Also for your information we only advertise the entire enterprise storage
+product line (DMX, VMAX, VMAX AFA, PowerMax) as SYMMETRIX in the VPD page.
+The ALUA capability is only used for mobility devices in an SRDF/Metro
+configuration and the current device stanza still works well in all of our
+testing."
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/hwtable.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 211087ad..a8ba28e3 100644
+--- a/libmultipath/hwtable.c
++++ b/libmultipath/hwtable.c
+@@ -329,9 +329,8 @@ static struct hwentry default_hw[] = {
+ 		/* Symmetrix / DMX / VMAX / PowerMax */
+ 		.vendor        = "EMC",
+ 		.product       = "SYMMETRIX",
+-		.pgpolicy      = GROUP_BY_PRIO,
++		.pgpolicy      = MULTIBUS,
+ 		.no_path_retry = 6,
+-		.pgfailback    = -FAILBACK_IMMEDIATE,
+ 	},
+ 	{
+ 		/* DGC CLARiiON CX/AX / VNX and Unity */

device-mapper-multipath.spec

@@ -1,6 +1,6 @@
 Name:    device-mapper-multipath
 Version: 0.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tools to manage multipath devices using device-mapper
 License: GPLv2
 URL:     http://christophe.varoqui.free.fr/
@@ -20,16 +20,18 @@ Patch0007: 0007-multipath-tools-make-EMC-SYMMETRIX-config-work-with-.patch
 Patch0008: 0008-multipath-tools-make-EMC-Invista-config-work-with-al.patch
 Patch0009: 0009-multipath-tools-make-COMPELNT-Compellent-Vol-config-.patch
 Patch0010: 0010-multipath-tools-remove-Compellent-maintainer.patch
-Patch0011: 0011-RH-fixup-udev-rules-for-redhat.patch
-Patch0012: 0012-RH-Remove-the-property-blacklist-exception-builtin.patch
-Patch0013: 0013-RH-don-t-start-without-a-config-file.patch
-Patch0014: 0014-RH-Fix-nvme-function-missing-argument.patch
-Patch0015: 0015-RH-use-rpm-optflags-if-present.patch
-Patch0016: 0016-RH-add-mpathconf.patch
-Patch0017: 0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
-Patch0018: 0018-RH-reset-default-find_mutipaths-value-to-off.patch
-Patch0019: 0019-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
-Patch0020: 0020-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
+Patch0011: 0011-Revert-multipath-tools-make-EMC-Invista-config-work-.patch
+Patch0012: 0012-Revert-multipath-tools-make-EMC-SYMMETRIX-config-wor.patch
+Patch0013: 0013-RH-fixup-udev-rules-for-redhat.patch
+Patch0014: 0014-RH-Remove-the-property-blacklist-exception-builtin.patch
+Patch0015: 0015-RH-don-t-start-without-a-config-file.patch
+Patch0016: 0016-RH-Fix-nvme-function-missing-argument.patch
+Patch0017: 0017-RH-use-rpm-optflags-if-present.patch
+Patch0018: 0018-RH-add-mpathconf.patch
+Patch0019: 0019-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+Patch0020: 0020-RH-reset-default-find_mutipaths-value-to-off.patch
+Patch0021: 0021-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
+Patch0022: 0022-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -227,6 +229,12 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Thu Oct 28 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-3
+- Update to the head of the upstream staging branch
+  * Patches 0011 & 0012 are from the upstream staging branch
+- Rename redhat patches
+  * Previous patches 0011-0020 are now patches 0013-0022
+
 * Wed Oct  6 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-2
 - Modify 0013-RH-don-t-start-without-a-config-file.patch
   * add condtion to multipathd.socket as well