diff --git a/0001-common-fix-a-mismatch-between-prototype-and-body.patch b/0001-common-fix-a-mismatch-between-prototype-and-body.patch
new file mode 100644
index 0000000..6c62af7
--- /dev/null
+++ b/0001-common-fix-a-mismatch-between-prototype-and-body.patch
@@ -0,0 +1,26 @@
+From 57a7e50be71e2677a5cb1a84b5f462d40182dee8 Mon Sep 17 00:00:00 2001
+From: Adam Borowski <kilobyte@angband.pl>
+Date: Fri, 29 Jan 2021 11:48:00 +0100
+Subject: [PATCH] common: fix a mismatch between prototype and body
+
+It makes gcc-11 complain.
+---
+ src/common/uuid.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/uuid.c b/src/common/uuid.c
+index 94fdd737c..da59208fb 100644
+--- a/src/common/uuid.c
++++ b/src/common/uuid.c
+@@ -53,7 +53,7 @@ util_uuid_to_string(const uuid_t u, char *buf)
+  * f81d4fae-7dec-11d0-a765-00a0c91e6bf6
+  */
+ int
+-util_uuid_from_string(const char *uuid, struct uuid *ud)
++util_uuid_from_string(const char uuid[POOL_HDR_UUID_STR_LEN], struct uuid *ud)
+ {
+ 	if (strlen(uuid) != 36) {
+ 		LOG(2, "invalid uuid string");
+-- 
+2.27.0
+
diff --git a/0001-test-util_badblock-don-t-pass-uninitialized-attr.patch b/0001-test-util_badblock-don-t-pass-uninitialized-attr.patch
new file mode 100644
index 0000000..a1402a7
--- /dev/null
+++ b/0001-test-util_badblock-don-t-pass-uninitialized-attr.patch
@@ -0,0 +1,29 @@
+From 16140fa1c132316fa806e569e50fbb4938246372 Mon Sep 17 00:00:00 2001
+From: Adam Borowski <kilobyte@angband.pl>
+Date: Sat, 12 Dec 2020 12:46:17 +0100
+Subject: [PATCH] test: util_badblock: don't pass uninitialized attr
+
+---
+ src/test/util_badblock/util_badblock.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/test/util_badblock/util_badblock.c b/src/test/util_badblock/util_badblock.c
+index a2274c79f..eb9aaa0aa 100644
+--- a/src/test/util_badblock/util_badblock.c
++++ b/src/test/util_badblock/util_badblock.c
+@@ -104,11 +104,10 @@ static void
+ do_open(const char *path)
+ {
+ 	struct pool_set *set;
+-	const struct pool_attr attr;
+ 	unsigned nlanes = 1;
+ 
+ 	if (util_pool_open(&set, path, MIN_PART,
+-				&attr, &nlanes, NULL, 0) != 0) {
++				NULL, &nlanes, NULL, 0) != 0) {
+ 		UT_FATAL("!util_pool_open: %s", path);
+ 	}
+ 
+-- 
+2.27.0
+
diff --git a/Makefile-bypass-check-doc-in-check.patch b/Makefile-bypass-check-doc-in-check.patch
new file mode 100644
index 0000000..47392ad
--- /dev/null
+++ b/Makefile-bypass-check-doc-in-check.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -86,7 +86,7 @@ check-remote: require-rpmem all
+ test check pcheck pycheck: all
+	$(MAKE) -C src $@
+
+-check pcheck pycheck: check-doc
++pcheck pycheck: check-doc
+
+ cstyle:
+	test -d .git && utils/check-commits.sh
diff --git a/nvml.spec b/nvml.spec
index c528064..9cfeebc 100644
--- a/nvml.spec
+++ b/nvml.spec
@@ -29,7 +29,7 @@
 
 Name:		nvml
 Version:	1.10
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Persistent Memory Development Kit (formerly NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
@@ -43,7 +43,9 @@ Source1:	pmdk-%{version}-man.tar.gz
 # do_open passes "attr" to util_pool_open which potentially reads that object
 # but do_open never initializes "attr"
 # may read that object
-Patch0:         nvml-gcc11.patch
+Patch0:         0001-test-util_badblock-don-t-pass-uninitialized-attr.patch
+Patch1:         0001-common-fix-a-mismatch-between-prototype-and-body.patch
+Patch2:         Makefile-bypass-check-doc-in-check.patch
 
 
 BuildRequires:	gcc
@@ -596,6 +598,8 @@ provided in the command line options to check whether files are in a consistent
 %prep
 %setup -q -n pmdk-%{upstreamversion}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -682,6 +686,12 @@ mkdir -p %{buildroot}%{_mandir}
 
 
 %changelog
+* Mon Aug 02 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-8.el9
+- Supersede uninitialized value patch with upstream version
+- Add upstream patch: common: fix mismatch between prototype and body
+- Makefile: bypass check-doc in check target
+- Related: rhbz#1985096
+
 * Fri Jul 30 2021 Bryan Gurney <bgurney@redhat.com> - 1.10.7-el9
 - Remove BuildRequires line for libunwind.devel
 - Resolves: rhbz#1984766
diff --git a/tests/tests.yml b/tests/tests.yml
index 22bf838..55004e0 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,10 +15,7 @@
         - libpmemobj-devel
         - libpmempool-devel
         - librpmem-devel
-        - libvmem-devel
-        - libvmmalloc-devel
         - pmempool
-        - pmreorder
         - ndctl-devel
         - daxctl-devel
         - libfabric-devel