diff --git a/configs/config-4.19.y-aarch64 b/configs/config-4.19.y-aarch64
index 33a026bfe5214844220addd2180268177c20dedf..46ecad5c9fbaa5bd71bdd4aa78e795b4d9a55024 100644
--- a/configs/config-4.19.y-aarch64
+++ b/configs/config-4.19.y-aarch64
@@ -4,10 +4,10 @@
 #
 
 #
-# Compiler: gcc (GCC) 8.3.1 20190311 (Red Hat 8.3.1-3)
+# Compiler: gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2)
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80301
+CONFIG_GCC_VERSION=90101
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -333,7 +333,6 @@ CONFIG_PCIE_IPROC_PLATFORM=y
 CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
-CONFIG_PCI_IOHUB_SRIOV=m
 
 #
 # DesignWare PCI Core Support
@@ -356,6 +355,11 @@ CONFIG_PCI_HISI=y
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
 
+#
+# PCIe IOHub
+#
+CONFIG_PCI_IOHUB_SRIOV=m
+
 #
 # Kernel Features
 #
@@ -640,6 +644,8 @@ CONFIG_VHOST_NET=m
 CONFIG_VHOST_VSOCK=m
 CONFIG_VHOST=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
@@ -710,6 +716,7 @@ CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
@@ -719,7 +726,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_LIVEPATCH=y
 
 #
 # GCOV-based kernel profiling
@@ -902,6 +908,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
@@ -4618,6 +4625,7 @@ CONFIG_PHY_HI6220_USB=m
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
+# CONFIG_ARM_SMMU_V3_PMU is not set
 # CONFIG_ARM_DSU_PMU is not set
 CONFIG_HISI_PMU=y
 CONFIG_QCOM_L2_PMU=y
@@ -4718,6 +4726,7 @@ CONFIG_OVERLAY_FS=m
 CONFIG_OVERLAY_FS_REDIRECT_DIR=y
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 CONFIG_OVERLAY_FS_INDEX=y
+# CONFIG_OVERLAY_FS_NFS_EXPORT is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_OVERLAY_FS_METACOPY is not set
 
diff --git a/configs/config-4.19.y-aarch64-debug b/configs/config-4.19.y-aarch64-debug
index 0d45cb6590e274e10aba7b4d0298782e8eea1530..af359aec897bcc25abc27c82171629551c7d8d1e 100644
--- a/configs/config-4.19.y-aarch64-debug
+++ b/configs/config-4.19.y-aarch64-debug
@@ -4,10 +4,10 @@
 #
 
 #
-# Compiler: gcc (GCC) 8.3.1 20190311 (Red Hat 8.3.1-3)
+# Compiler: gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2)
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80301
+CONFIG_GCC_VERSION=90101
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CONSTRUCTORS=y
@@ -337,7 +337,6 @@ CONFIG_PCIE_IPROC_PLATFORM=y
 CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
-CONFIG_PCI_IOHUB_SRIOV=m
 
 #
 # DesignWare PCI Core Support
@@ -360,6 +359,11 @@ CONFIG_PCI_HISI=y
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
 
+#
+# PCIe IOHub
+#
+CONFIG_PCI_IOHUB_SRIOV=m
+
 #
 # Kernel Features
 #
@@ -645,6 +649,8 @@ CONFIG_VHOST_NET=m
 CONFIG_VHOST_VSOCK=m
 CONFIG_VHOST=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
@@ -715,6 +721,7 @@ CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -723,7 +730,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_LIVEPATCH=y
 
 #
 # GCOV-based kernel profiling
@@ -882,6 +888,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
@@ -4600,6 +4607,7 @@ CONFIG_PHY_HI6220_USB=m
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
+# CONFIG_ARM_SMMU_V3_PMU is not set
 # CONFIG_ARM_DSU_PMU is not set
 CONFIG_HISI_PMU=y
 CONFIG_QCOM_L2_PMU=y
@@ -4700,6 +4708,7 @@ CONFIG_OVERLAY_FS=m
 CONFIG_OVERLAY_FS_REDIRECT_DIR=y
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 CONFIG_OVERLAY_FS_INDEX=y
+# CONFIG_OVERLAY_FS_NFS_EXPORT is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_OVERLAY_FS_METACOPY is not set