Browse code

Enable Geneve module support in generic kernel

Change-Id: I38ad9b4ecf3f5e9649e3953ede65e0ed2c61691e
Reviewed-on: http://photon-jenkins.eng.vmware.com/101
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Tested-by: jenkins-photon <wangnan2015@hotmail.com>

Vinay Kulkarni authored on 2015/11/10 01:57:20
Showing 2 changed files
... ...
@@ -119,9 +119,7 @@ CONFIG_HIGH_RES_TIMERS=y
119 119
 # CPU/Task time and stats accounting
120 120
 #
121 121
 CONFIG_VIRT_CPU_ACCOUNTING=y
122
-# CONFIG_TICK_CPU_ACCOUNTING is not set
123 122
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
124
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
125 123
 CONFIG_BSD_PROCESS_ACCT=y
126 124
 CONFIG_BSD_PROCESS_ACCT_V3=y
127 125
 CONFIG_TASKSTATS=y
... ...
@@ -786,7 +784,7 @@ CONFIG_NET_IPVTI=m
786 786
 CONFIG_NET_UDP_TUNNEL=m
787 787
 # CONFIG_NET_FOU is not set
788 788
 # CONFIG_NET_FOU_IP_TUNNELS is not set
789
-# CONFIG_GENEVE_CORE is not set
789
+CONFIG_GENEVE_CORE=m
790 790
 CONFIG_INET_AH=m
791 791
 CONFIG_INET_ESP=m
792 792
 CONFIG_INET_IPCOMP=m
... ...
@@ -1256,6 +1254,7 @@ CONFIG_DNS_RESOLVER=m
1256 1256
 CONFIG_OPENVSWITCH=m
1257 1257
 CONFIG_OPENVSWITCH_GRE=m
1258 1258
 CONFIG_OPENVSWITCH_VXLAN=m
1259
+CONFIG_OPENVSWITCH_GENEVE=m
1259 1260
 CONFIG_VSOCKETS=m
1260 1261
 CONFIG_VMWARE_VMCI_VSOCKETS=m
1261 1262
 CONFIG_NETLINK_MMAP=y
... ...
@@ -1803,6 +1802,7 @@ CONFIG_MACVLAN=m
1803 1803
 CONFIG_MACVTAP=m
1804 1804
 CONFIG_IPVLAN=m
1805 1805
 CONFIG_VXLAN=m
1806
+CONFIG_GENEVE=m
1806 1807
 CONFIG_NETCONSOLE=m
1807 1808
 CONFIG_NETCONSOLE_DYNAMIC=y
1808 1809
 CONFIG_NETPOLL=y
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:        linux
4 4
 Version:    4.2.0
5
-Release:    1%{?dist}
5
+Release:    2%{?dist}
6 6
 License:    GPLv2
7 7
 URL:        http://www.kernel.org/
8 8
 Group:        System Environment/Kernel
... ...
@@ -141,6 +141,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
141 141
 /lib/modules/%{version}/kernel/sound
142 142
 
143 143
 %changelog
144
+*	Mon Nov 09 2015 Vinay Kulkarni <kulkarniv@vmware.com> 4.2.0-2
145
+- 	Enable Geneve module support for generic kernel.
144 146
 *	Fri Oct 23 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-1
145 147
 - 	Upgraded the generic linux kernel to version 4.2.0 & and updated timer handling to full tickless mode. 
146 148
 *	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.0.9-5