From: David S. Miller Date: Mon, 9 May 2016 04:21:13 +0000 (-0400) Subject: Merge branch 'mlx5-build-fix' X-Git-Tag: android-x86-7.1-r1~1576^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8846a125de97f96be64ca234906eedfd26ad778e;p=android-x86%2Fkernel.git Merge branch 'mlx5-build-fix' Saeed Mahameed says: ==================== net/mlx5e: Kconfig fixes for VxLAN Reposting to net the build errors fixes posted by Arnd last week. Originally Arnd posted those fixes to net-next, while the issue is also seen in net. For net-next a different approach is required for fixing the issue as VXLAN and Device Drivers are no longer dependent, but there is no harm for those fixes to get into net-next. Optionally, once net is merged into net-next we can Revert "net/mlx5e: make VXLAN support conditional" as the CONFIG_MLX5_CORE_EN_VXLAN will no longer be required. Applied on top: 288928658583 ('mlxsw: spectrum: Add missing rollback in flood configuration') ==================== Signed-off-by: David S. Miller --- 8846a125de97f96be64ca234906eedfd26ad778e