summaryrefslogtreecommitdiffstats
path: root/kernel-aarch64-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-11-25 06:13:21 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-11-25 06:13:21 +0100
commit7f7ff77785c0a2e64b12f98fcce17fd021aeccc1 (patch)
tree001a72f837a42621653307ae8c6ec83eb7e288ad /kernel-aarch64-rhel.config
parent121dabf2a653b60b703e4c706711ea13cfd51f85 (diff)
parentf381a440d3fa5705253011402f9e856e58f40f46 (diff)
downloadkernel-7f7ff77785c0a2e64b12f98fcce17fd021aeccc1.tar.gz
kernel-7f7ff77785c0a2e64b12f98fcce17fd021aeccc1.tar.xz
kernel-7f7ff77785c0a2e64b12f98fcce17fd021aeccc1.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc2.20211124git5d9f4cf36721.19.vanilla.1.fc35
Diffstat (limited to 'kernel-aarch64-rhel.config')
-rw-r--r--kernel-aarch64-rhel.config5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 05a993473..db9e9be60 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3773,7 +3773,7 @@ CONFIG_NET_VENDOR_HISILICON=y
CONFIG_NET_VENDOR_HUAWEI=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_LITEX=y
+# CONFIG_NET_VENDOR_LITEX is not set
# CONFIG_NET_VENDOR_MARVELL is not set
CONFIG_NET_VENDOR_MELLANOX=y
# CONFIG_NET_VENDOR_MICREL is not set
@@ -4395,17 +4395,14 @@ CONFIG_PPS_CLIENT_LDISC=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=y
CONFIG_PPTP=m
-# CONFIG_PREEMPT_BEHAVIOUR is not set
CONFIG_PREEMPT_DYNAMIC=y
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_LL is not set
-# CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_NOTIFIERS=y
# CONFIG_PREEMPT_TRACER is not set
-CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_PRIME_NUMBERS is not set