diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-14 21:05:46 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-14 21:05:46 +0200 |
commit | 4b3848972b6fbc0e0325d77e7b14174c52fd5a00 (patch) | |
tree | 69344e95fce778ed61123da0bab49ae7d56353d5 /kernel-s390x-rhel.config | |
parent | 92b20db5d70b522842cb6d47e3eba89552a05c12 (diff) | |
parent | ec39482fad6babae562a01b46fa2f878f1e0c935 (diff) | |
download | kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.tar.gz kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.tar.xz kernel-4b3848972b6fbc0e0325d77e7b14174c52fd5a00.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc38kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc37kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc36kernel-6.1.0-0.rc0.20221014git9c9155a3509a.11.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index fd8a871fa..2d5ba58fc 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1513,6 +1513,7 @@ CONFIG_EVENT_TRACING=y CONFIG_EVM_ATTR_FSUUID=y # CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM=y +# CONFIG_EXAR_WDT is not set CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set @@ -1962,6 +1963,7 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_HP206C is not set # CONFIG_HPFS_FS is not set # CONFIG_HP_ILO is not set +# CONFIG_HP_WATCHDOG is not set CONFIG_HSA_AMD_P2P=y CONFIG_HSA_AMD_SVM=y CONFIG_HSA_AMD=y @@ -3118,7 +3120,7 @@ CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_CORE=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y -# CONFIG_MLX5_EN_MACSEC is not set +CONFIG_MLX5_EN_MACSEC=y CONFIG_MLX5_EN_RXNFC=y CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_ESWITCH=y @@ -3560,7 +3562,7 @@ CONFIG_NET_TC_SKB_EXT=y CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set -CONFIG_NET_VENDOR_ADI=y +# CONFIG_NET_VENDOR_ADI is not set # CONFIG_NET_VENDOR_AGERE is not set # CONFIG_NET_VENDOR_ALACRITECH is not set # CONFIG_NET_VENDOR_ALTEON is not set |