Linux v3.19-rc4-46-g188c901941ef

- Enable I40E_VXLAN (rhbz 1182116)

3 files changed, 7 insertions, 3 deletions

diff --git a/config-generic b/config-generic
index 58450cb30..bb59c9c51 100644
--- a/config-generic
+++ b/config-generic
@@ -1423,7 +1423,7 @@ CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_I40E=m
-# CONFIG_I40E_VXLAN is not set
+CONFIG_I40E_VXLAN=y
 # CONFIG_I40E_DCB is not set
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
diff --git a/kernel.spec b/kernel.spec
index 659fcfd16..741faaf91 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2217,6 +2217,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Jan 14 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc4.git2.1
+- Linux v3.19-rc4-46-g188c901941ef
+- Enable I40E_VXLAN (rhbz 1182116)
+
 * Tue Jan 13 2015 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable Checkpoint/Restore on ARMv7 (rhbz 1146995)
 
diff --git a/sources b/sources
index 9a7e9565d..16d35de08 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 9e854df51ca3fef8bfe566dbd7b89241  linux-3.18.tar.xz
 813ccb96f0b379d656e57442c2587ca3  perf-man-3.18.tar.gz
 7aa3aed1c5a65bb633e8c3e437ec0dfb  patch-3.19-rc4.xz
-5c8b52a198829b78124c464e1cca0e61  patch-3.19-rc4-git1.xz
+2559f3d80b67358207dad7f4e8971e43  patch-3.19-rc4-git2.xz