From 58f461d452ca71855ab4a53cf6d36eb8ab1a818f Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 13 Jul 2021 16:59:00 -0500
Subject: kernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18

* Tue Jul 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210713git7fef2edf7cc7.18]
- Turn on CONFIG_STACKTRACE for s390x zfpcdump kernels (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel-aarch64-rhel.config | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'kernel-aarch64-rhel.config')

diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3493a3386..cf34d517b 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -238,8 +238,8 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_16K_PAGES is not set
-# CONFIG_ARM64_4K_PAGES is not set
-CONFIG_ARM64_64K_PAGES=y
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_64K_PAGES is not set
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_AMU_EXTN=y
 CONFIG_ARM64_BTI_KERNEL=y
@@ -269,8 +269,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_MTE=y
-# CONFIG_ARM64_PA_BITS_48 is not set
-CONFIG_ARM64_PA_BITS_52=y
+CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_PSEUDO_NMI=y
@@ -287,9 +286,9 @@ CONFIG_ARM64_TLB_RANGE=y
 CONFIG_ARM64_UAO=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM64_USER_VA_BITS_52=y
-# CONFIG_ARM64_VA_BITS_42 is not set
-# CONFIG_ARM64_VA_BITS_48 is not set
-CONFIG_ARM64_VA_BITS_52=y
+# CONFIG_ARM64_VA_BITS_39 is not set
+CONFIG_ARM64_VA_BITS_48=y
+# CONFIG_ARM64_VA_BITS_52 is not set
 CONFIG_ARM64_VHE=y
 CONFIG_ARM64=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
@@ -1690,7 +1689,7 @@ CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SM712 is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
 # CONFIG_FB_TFT is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
@@ -4703,7 +4702,7 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 CONFIG_RTL8188EE=m
@@ -5769,10 +5768,10 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_CRB=y
 # CONFIG_TCG_INFINEON is not set
 CONFIG_TCG_NSC=m
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
+CONFIG_TCG_TIS_I2C_ATMEL=m
 # CONFIG_TCG_TIS_I2C_CR50 is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 # CONFIG_TCG_TIS_SPI is not set
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
@@ -6562,7 +6561,7 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
-# CONFIG_VIRTIO_IOMMU is not set
+CONFIG_VIRTIO_IOMMU=m
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 CONFIG_VIRTIO_MMIO=m
-- 
cgit