summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-07 16:03:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-07 16:03:55 +0200
commitfea02dbd16c04b9501a97a2e2ed2eb72fb086c76 (patch)
tree08ceb43378f200003f99397b208fe6de5d25278d /kernel-x86_64-rhel.config
parent2f00d5d1307017b0c8fb556f78d14749e9b742db (diff)
parent4bc3c54f38c58c791541b236f9eb475eac98b8bf (diff)
downloadkernel-5.13.0-0.rc5.38.vanilla.1.fc35.tar.gz
kernel-5.13.0-0.rc5.38.vanilla.1.fc35.tar.xz
kernel-5.13.0-0.rc5.38.vanilla.1.fc35.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.38.vanilla.1.fc35kernel-5.13.0-0.rc5.38.vanilla.1.fc34kernel-5.13.0-0.rc5.38.vanilla.1.fc33
Diffstat (limited to 'kernel-x86_64-rhel.config')
-rw-r--r--kernel-x86_64-rhel.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 4ab7cbf92..e7d69edf6 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -765,7 +765,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-# CONFIG_CORESIGHT_TRBE is not set
CONFIG_CORTINA_PHY=m
# CONFIG_COUNTER is not set
# CONFIG_CPA_DEBUG is not set
@@ -2418,6 +2417,7 @@ CONFIG_IOSCHED_BFQ=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IOSF_MBI=y
# CONFIG_IO_STRICT_DEVMEM is not set
+# CONFIG_IO_URING is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MANGLE=m