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-aarch64-rhel.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-aarch64-rhel.config')
| -rw-r--r-- | kernel-aarch64-rhel.config | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index cec332b10..c005c2f4d 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3118,7 +3118,7 @@ CONFIG_MICROCHIP_PHY=m CONFIG_MICROCHIP_T1_PHY=m # CONFIG_MICROCODE_OLD_INTERFACE is not set CONFIG_MICROSEMI_PHY=m -# CONFIG_MICROSOFT_MANA is not set +CONFIG_MICROSOFT_MANA=m CONFIG_MIGRATION=y CONFIG_MII=m # CONFIG_MINIX_FS is not set @@ -3141,18 +3141,18 @@ CONFIG_MLX5_CORE=m CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_RXNFC=y -# CONFIG_MLX5_EN_TLS is not set +CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_ESWITCH=y # CONFIG_MLX5_FPGA_IPSEC is not set # CONFIG_MLX5_FPGA_TLS is not set CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m -# CONFIG_MLX5_IPSEC is not set +CONFIG_MLX5_IPSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_TC_SAMPLE=y -# CONFIG_MLX5_TLS is not set +CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set @@ -3440,7 +3440,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_XTABLES_COMPAT=y +# CONFIG_NETFILTER_XTABLES_COMPAT is not set CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m |