diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-12 07:39:28 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-12 07:39:28 +0200 |
| commit | 181a7652a31ac21c62c532c4cac67b567d189b51 (patch) | |
| tree | 1ba031f008a22662aeba6e979feb2abbed483b2e /config-generic | |
| parent | ef83101faa863cfe7cc0c39ac5e7276675e48397 (diff) | |
| parent | 4f98eabc018bd4dfce36e8f7121f8c3951f56853 (diff) | |
| download | kernel-4.6.0-0.rc7.git2.1.vanilla.knurd.1.fc24.tar.gz kernel-4.6.0-0.rc7.git2.1.vanilla.knurd.1.fc24.tar.xz kernel-4.6.0-0.rc7.git2.1.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/master' into f24-user-thl-vanilla-rawhidekernel-4.6.0-0.rc7.git2.1.vanilla.knurd.1.fc24
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 4a5879d23..6e2c632f9 100644 --- a/config-generic +++ b/config-generic @@ -1707,6 +1707,7 @@ CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN_DCB=y +CONFIG_MLX5_CORE_EN_VXLAN=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_HWMON=y |