diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-14 06:09:18 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-14 06:09:18 +0200 |
commit | bb5954ada68e6443df3ba7beff0b070101c23fc6 (patch) | |
tree | 88182949107d1a47935fea2d0466301a619b9538 /kernel-i686-fedora.config | |
parent | 8b5ccc311973e67c074b4048d926c748274346d9 (diff) | |
parent | e12344cfaccaeaf576e5ea8e49e1e8d9152716b0 (diff) | |
download | kernel-bb5954ada68e6443df3ba7beff0b070101c23fc6.tar.gz kernel-bb5954ada68e6443df3ba7beff0b070101c23fc6.tar.xz kernel-bb5954ada68e6443df3ba7beff0b070101c23fc6.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.vanilla.1.fc35kernel-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.vanilla.1.fc34kernel-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.vanilla.1.fc33kernel-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.vanilla.1.fc32
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r-- | kernel-i686-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 685557fc1..cd8d71cf5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -3573,6 +3573,7 @@ CONFIG_MLX5_CORE=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_RXNFC=y +CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_ESWITCH=y # CONFIG_MLX5_FPGA is not set # CONFIG_MLX5_INFINIBAND is not set @@ -3582,7 +3583,7 @@ CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y -# CONFIG_MLX5_TLS is not set +CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m CONFIG_MLX5_VDPA=y CONFIG_MLX90614=m |