commit

diff --git a/meta b/meta
index 69edd2f5bd3dfda3b037eae81ef303a2d1835b0b..f85d236b86e452edcc82bb2f6b1a4b8babbf97a2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,7 @@
 Version: 1
-Previous: 8a6dafc078073c2b3a123e89529bdeaf34d86ac4
+Previous: 1273350bb64eb1be7ed6adbe3d26c863d769ca1f
 Head: d0c3b92fea66953c1797e09b21103719a80f1135
 Applied:
-  sgid: 03c383af0899a811e0f491699fc3a88c5708da26
-  v1.1make: d0c3b92fea66953c1797e09b21103719a80f1135
 Unapplied:
   v1.1: abae5d0f24b0639b60a38861c3324536b3b96d5b
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a

diff --git a/patches/sgid b/patches/sgid
deleted file mode 100644 (file)
index e86e37a..0000000
--- a/patches/sgid
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: 4df8fa519baf0e24c5af25c6000d5277b1798cff
-Top:    3525e2a39882899413a85b1509cf42c86fd1d38b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-07-29 13:53:32 -0700
-
-acmp: Specify SGID in PR query
-
-If a PR query is issued with the DGID set, but the SGID not set,
-then opensm version 3.3.19 (and likely others) will return a PR
-with the SGID set to that of the SM.  This appears to be a bug
-with the SM, as an SLID is provided.
-
-In order to be safe, specify the SGID with the PR query, so that
-we get a PR that's usable.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/prov/acmp/src/acmp.c b/prov/acmp/src/acmp.c
-index 2b85958..a590058 100644
---- a/prov/acmp/src/acmp.c
-+++ b/prov/acmp/src/acmp.c
-@@ -852,12 +852,16 @@ acmp_record_path_addr(struct acmp_ep *ep, struct acmp_dest *dest,
-       acm_log(2, "%s\n", dest->name);
-       dest->path.pkey = htons(ep->pkey);
-       dest->path.dgid = path->dgid;
--      if (path->slid || !ib_any_gid(&path->sgid)) {
--              dest->path.sgid = path->sgid;
-+      if (path->slid) {
-               dest->path.slid = path->slid;
-       } else {
-               dest->path.slid = htons(ep->port->lid);
-       }
-+      if (!ib_any_gid(&path->sgid)) {
-+              dest->path.sgid = path->sgid;
-+      } else {
-+              dest->path.sgid = ep->mc_dest[0].path.sgid;
-+      }
-       dest->path.dlid = path->dlid;
-       dest->state = ACMP_ADDR_RESOLVED;
- }

diff --git a/patches/v1.1make b/patches/v1.1make
deleted file mode 100644 (file)
index 4a3dbf8..0000000
--- a/patches/v1.1make
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 3525e2a39882899413a85b1509cf42c86fd1d38b
-Top:    00ef895f70b597945f0713359882c20ba7a1a66a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-07-29 11:42:59 -0700
-
-Add missing ibacm_prov man page to install
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 73b1a31..7690cb9 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -34,10 +34,13 @@ libibacmpinclude_HEADERS = include/infiniband/acm.h include/infiniband/acm_prov.
- man_MANS = \
-       man/ib_acme.1 \
-       man/ibacm.1 \
--      man/ibacm.7
-+      man/ibacm.7 \
-+      man/ibacm_prov.7
- 
--EXTRA_DIST = src/acm_util.h prov/acmp/src/libibacmp.map include/acm_mad.h src/libacm.h ibacm.init.in \
--           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) ibacm_hosts.data
-+EXTRA_DIST = src/acm_util.h prov/acmp/src/libibacmp.map \
-+              include/acm_mad.h src/libacm.h ibacm.init.in \
-+              linux/osd.h linux/dlist.h ibacm.spec.in \
-+              $(man_MANS) ibacm_hosts.data
- 
- install-exec-hook:
-       install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;