Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc34kernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc33kernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc32

14 files changed, 31 insertions, 28 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index d7d73a157..f633d0da8 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 74e14fbf7..376e3085b 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 6abf37501..e355d2c89 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 ce7981907..2165d2d70 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 7a4cf5edb..a61f7792c 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-fedora.config b/kernel-s390x-debug-fedora.config
index 907753e6f..e37706292 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -6730,7 +6730,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 342ea50d2..ef303cc24 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
@@ -6102,7 +6102,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_VIRTIO_FS is not set
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 755f8623f..45a9a2392 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -6707,7 +6707,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index cfadae9da..91fece993 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
@@ -6083,7 +6083,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_VIRTIO_FS is not set
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 12973ee50..a92a429c0 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 6e02e2577..ae500fcb8 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 7fa62fcaa..7f9fdda72 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 e789fcd5a..4e8f6a592 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.20210126git13391c60da33.135
+%global distro_build 0.rc5.20210127git2ab38c17aac1.136
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.11.0
-%define pkgrelease 0.rc5.20210126git13391c60da33.135
+%define pkgrelease 0.rc5.20210127git2ab38c17aac1.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.20210126git13391c60da33.135%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210127git2ab38c17aac1.136%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -603,7 +603,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210126git13391c60da33.tar.xz
+Source0: linux-20210127git2ab38c17aac1.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1249,8 +1249,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20210126git13391c60da33 -c
-mv linux-20210126git13391c60da33 linux-%{KVERREL}
+%setup -q -n kernel-20210127git2ab38c17aac1 -c
+mv linux-20210127git2ab38c17aac1 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2729,11 +2729,14 @@ fi
 #
 #
 %changelog
-* 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 3be49615b..5a2eff105 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210126git13391c60da33.tar.xz) = 1bcef2ca961d43bf2886914bd414cf577cb529a8fe1a6b1bb4a96cf4635474450dc83f8ee63fcdf0a2422cb26bf45dce196d5cda6b93e59905bb9dc7329e58eb
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.20210126git13391c60da33.135.tar.bz2) = 8c38e33078fcc3322210cd9900b060a76a7e909dec79d96423be0dbbad65c3e50a2400af682a297d5a36fb6fb54b71b7dc39d72be62128b8906c64f7d1b0ebef
-SHA512 (kernel-kabi-dw-5.11.0-0.rc5.20210126git13391c60da33.135.tar.bz2) = 41ab644c57311a7c0bba0010fc313e536a28dd749247e60951d6669ccc853204064e78b4de3b4f9420ba7d27d61969575873344e60df923499fedd1873a2191a
+SHA512 (linux-20210127git2ab38c17aac1.tar.xz) = ed1f34adf9d0e09d4e49bf466cbacffe2ab734c866da3221408a8c34eb1f084a569a69a3709b622ae2b3267b10b6e94c0c93186474d30d834fb26dc6be79aa33
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.20210127git2ab38c17aac1.136.tar.bz2) = 9e09c536375497287a787a2d85399161c608984366ec260f8b35ba053f2f864c48850563d0881b6ca1c1d5a14984ff6a466677ff4df0f263b10fba46c5501c88
+SHA512 (kernel-kabi-dw-5.11.0-0.rc5.20210127git2ab38c17aac1.136.tar.bz2) = 09861dbf128cfa2e07c796f85ccdc0889b347ba072c65facfb969b89b7d5df75c4a884f85e3ce930ae33f6306f9d1b055e14c97052606d4af99d3edfd2e99301