From c918bd768aa916cb376b54354b0753903a1a18b5 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Mon, 5 Apr 2021 09:56:20 -0500
Subject: kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181

* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc5.20210331git2bb25b3a748a.181]
- configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini)
- Remove _legacy_common_support (Justin M. Forbes)
- redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel-armv7hl-fedora.config | 1 -
 1 file changed, 1 deletion(-)

(limited to 'kernel-armv7hl-fedora.config')

diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 9435a1e66..fd2f2d6f7 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -326,7 +326,6 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARM64_16K_PAGES is not set
 # CONFIG_ARM64_64K_PAGES is not set
 CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
-- 
cgit