From 8a2fdf2bb5b38ef5e9ff4b8cf3730357e9b19d0e Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mar 31 2015 15:15:01 +0000
Subject: Enable MLX4_EN_VXLAN (rhbz 1207728)


---

diff --git a/config-arm64 b/config-arm64
index c6a9a9e..02dc10b 100644
--- a/config-arm64
+++ b/config-arm64
@@ -149,6 +149,7 @@ CONFIG_AMD_XGBE_PHY=m
 CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
 
 # CONFIG_IMX_THERMAL is not set
 
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 2d705f1..00aaace 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -211,6 +211,7 @@ CONFIG_NET_VENDOR_IBM=y
 
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
 
 # CONFIG_SERIO_XILINX_XPS_PS2 is not set
 
diff --git a/config-s390x b/config-s390x
index 3e700b1..829412f 100644
--- a/config-s390x
+++ b/config-s390x
@@ -302,6 +302,7 @@ CONFIG_HOTPLUG_PCI_S390=y
 
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_MLX4_INFINIBAND=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 19364ed..779c333 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -168,6 +168,7 @@ CONFIG_NTB_NETDEV=m
 CONFIG_IP1000=m
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
 # CONFIG_MLX4_DEBUG is not set
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
diff --git a/kernel.spec b/kernel.spec
index 225496b..c565b8b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2223,6 +2223,9 @@ fi
 #
 # 
 %changelog
+* Tue Mar 31 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable MLX4_EN_VXLAN (rhbz 1207728)
+
 * Mon Mar 30 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git0.1
 - Linux v4.0-rc6