diff --git a/Makefile.rhelver b/Makefile.rhelver
index d7d73a1..f633d0d 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 = 135
+RHEL_RELEASE = 136
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 74e14fb..376e308 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1127,7 +1127,7 @@ CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VM_PGFLAGS is not set
-# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
 # CONFIG_DEBUG_VM_VMACACHE is not set
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
@@ -4043,7 +4043,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 6abf375..e355d2c 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4022,7 +4022,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index ce79819..2165d2d 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1009,7 +1009,7 @@ CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_DEBUG_USER_ASCE is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_VM_PGFLAGS is not set
-# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
 # CONFIG_DEBUG_VM_VMACACHE is not set
 CONFIG_DEBUG_VM=y
@@ -3875,7 +3875,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 7a4cf5e..a61f779 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -3858,7 +3858,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 342ea50..eb1a4ac 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1015,7 +1015,7 @@ CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_DEBUG_USER_ASCE is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_VM_PGFLAGS is not set
-# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
 # CONFIG_DEBUG_VM_VMACACHE is not set
 CONFIG_DEBUG_VM=y
@@ -3850,7 +3850,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index cfadae9..92d0786 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -3833,7 +3833,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 12973ee..a92a429 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3856,7 +3856,7 @@ CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 6e02e25..ae500fc 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1063,7 +1063,7 @@ CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_DEBUG_USER_ASCE is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_VM_PGFLAGS is not set
-# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
 # CONFIG_DEBUG_VM_VMACACHE is not set
 CONFIG_DEBUG_VM=y
@@ -4063,7 +4063,7 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 7fa62fc..7f9fdda 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4044,7 +4044,7 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_ELKHARTLAKE=m
-# CONFIG_PINCTRL_EMMITSBURG is not set
+CONFIG_PINCTRL_EMMITSBURG=m
 # CONFIG_PINCTRL_EQUILIBRIUM is not set
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
diff --git a/kernel.spec b/kernel.spec
index 01d777b..c0d5866 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.rc5.135
+%global distro_build 0.rc5.136
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -105,13 +105,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.11.0
-%define pkgrelease 0.rc5.135
+%define pkgrelease 0.rc5.136
 
 # This is needed to do merge window version magic
 %define patchlevel 11
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.135%{?buildid}%{?dist}
+%define specrelease 0.rc5.136%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -601,7 +601,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11.0-0.rc5.135.tar.xz
+Source0: linux-5.11.0-0.rc5.136.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1246,8 +1246,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.11.0-0.rc5.135 -c
-mv linux-5.11.0-0.rc5.135 linux-%{KVERREL}
+%setup -q -n kernel-5.11.0-0.rc5.136 -c
+mv linux-5.11.0-0.rc5.136 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2735,14 +2735,17 @@ fi
 #
 #
 %changelog
-* Tue Jan 26 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc5.135]
-- v5.11-rc5-7-g13391c60da33 rebase
+* Wed Jan 27 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc5.136]
+- v5.11-rc5-37-g2ab38c17aac1 rebase
 
-* Tue Jan 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210126git13391c60da33.135]
+* Wed Jan 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210127git2ab38c17aac1.136]
 - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski)
 - redhat: add genlog.py script (Herton R. Krzesinski)
 - Turn off vdso_install for ppc (Justin M. Forbes)
 
+* Wed Jan 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210127git2ab38c17aac1.135]
+- New configs in lib/Kconfig.debug (Jeremy Cline)
+
 * Mon Jan 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.133]
 - Fedora 5.11 config updates part 4 ("Justin M. Forbes")
 - Fedora 5.11 config updates part 3 ("Justin M. Forbes")
diff --git a/sources b/sources
index ceae16b..5636fcc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.11.0-0.rc5.135.tar.xz) = d97a79606bf9773ed1fe79e3733d282dc0aacf314cbccdc51355149c37d49820095b439961e164bb93adf88683b02c4653ac58f4554d43fe5f18d1cd559eabbe
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.135.tar.bz2) = 37a1cd238a8c1d106a53830c71e5cc4ae91420a6a66f178fd12f0f6063b05631102b6ce0571d85aa136ad71dd579bf7935cee1e648721e4e7a3236515aeb8551
-SHA512 (kernel-kabi-dw-5.11.0-0.rc5.135.tar.bz2) = 3049fea08eeefe9de1aa41d49ec1c452f81d7283dfae2771f3328a4b750f85dacfe0b0a008f241b084e315473dce4b2ebae5e7e4c3f6da4a8eda5c93b3f30e08
+SHA512 (linux-5.11.0-0.rc5.136.tar.xz) = 7b9cb1232929dcd767342bfbe328b8517f8efcf04bc665039cc6d9f04c1bfc6af0bbf9945e77d47e550b4c512fc94d4493932789cf6baa6f0c15e1680ab7d46b
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.136.tar.bz2) = ee93b1abd1bf4b430a3604cf8d580589dd78165541b82fca9b56ac1f549fed5234f46e784a5edaac01a004ccb3d27e904a71a84026562fb664d1abdf0a40cf5b
+SHA512 (kernel-kabi-dw-5.11.0-0.rc5.136.tar.bz2) = 12a9d54deadfca21f3a21d31d34d00d6f6692a3426417c497ab599ec127ddafc91e0a0ae07a3426fdfa5eb3d5f2bf4decaa9490bd96e6e3d5bbe11f4c9e7c465