diff --git a/Makefile.rhelver b/Makefile.rhelver
index a9b93933e..28a9af1ff 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 171
+RHEL_RELEASE = 172
 
 #
 # Early y+1 numbering
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 1b5200090..0f12d627f 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -6013,7 +6013,7 @@ CONFIG_VEXPRESS_SYSCFG=y
 # CONFIG_VFAT_FS is not set
 CONFIG_VFIO_AP=m
 CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
+# CONFIG_VFIO is not set
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
 # CONFIG_VFIO_NOIOMMU is not set
diff --git a/kernel.spec b/kernel.spec
index 89811b238..fe544e1ba 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -64,7 +64,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc3.20210318git6417f03132a6.171
+%global distro_build 0.rc3.20210319git8b12a62a4e3e.172
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -105,13 +105,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.12.0
-%define pkgrelease 0.rc3.20210318git6417f03132a6.171
+%define pkgrelease 0.rc3.20210319git8b12a62a4e3e.172
 
 # This is needed to do merge window version magic
 %define patchlevel 12
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20210318git6417f03132a6.171%{?buildid}%{?dist}
+%define specrelease 0.rc3.20210319git8b12a62a4e3e.172%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -602,7 +602,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210318git6417f03132a6.tar.xz
+Source0: linux-20210319git8b12a62a4e3e.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1250,8 +1250,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20210318git6417f03132a6 -c
-mv linux-20210318git6417f03132a6 linux-%{KVERREL}
+%setup -q -n kernel-20210319git8b12a62a4e3e -c
+mv linux-20210319git8b12a62a4e3e linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
diff --git a/sources b/sources
index 60177d1ae..3a0d0cce7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210318git6417f03132a6.tar.xz) = 83ed3ba48702e8342d86968abe6d7ee54d60c006d5fb3e0a614d955134f761e3e186eda912051b1f4cca66621d5189ca3ccb70246547837510672927f476c273
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.20210318git6417f03132a6.171.tar.bz2) = d3a47c4dbffa9ac1a2ef65b34fdad638d553da136ed1c3213387db0403094de80fcedec99acddf555cec6d453fabc67a11f5f82349a3de3bb9805a7515d23a8e
-SHA512 (kernel-kabi-dw-5.12.0-0.rc3.20210318git6417f03132a6.171.tar.bz2) = 65023579b6585d82b66589bad12e3bece4c2f77836764b98561c2c7b4a8ad92b256f4ab72809c81d03c1ed9e945598d6b896866d33bd9c00c6a80651cbe4375b
+SHA512 (linux-20210319git8b12a62a4e3e.tar.xz) = 899482f0398ec21cfef0d0d90f298d2adee972d490ee0826af1579122549fb0b5b63617a43638a3a3991a6ce84c0aebedcfe224c0eb74e7ef33e13d77410cc30
+SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.20210319git8b12a62a4e3e.172.tar.bz2) = 7b76b2f82f19f070e7deaf025d213e99686f69acc91aadaf91bb9d4b2eca2dcdeb50ebaf1347c5fd6063687e0a4e1410f050d5037cffa0104bc5dd2b7b812b48
+SHA512 (kernel-kabi-dw-5.12.0-0.rc3.20210319git8b12a62a4e3e.172.tar.bz2) = 190366dbe2789ae8d1b36bac8d32706f4c9048021c4bc767ec69f3d7b7b0fda129982d0056c4b46b0cdc8e32c2d103f4fc949f6f94e6fa3d0d5ad6ad0456c788