Change-Id: If5b765a1de5c105c4eb8376e5dfecd3fb1e44b42
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2686
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
... | ... |
@@ -1382,7 +1382,7 @@ CONFIG_NET_MPLS_GSO=m |
1382 | 1382 |
# CONFIG_MPLS_ROUTING is not set |
1383 | 1383 |
# CONFIG_HSR is not set |
1384 | 1384 |
# CONFIG_NET_SWITCHDEV is not set |
1385 |
-# CONFIG_NET_L3_MASTER_DEV is not set |
|
1385 |
+CONFIG_NET_L3_MASTER_DEV=y |
|
1386 | 1386 |
# CONFIG_NET_NCSI is not set |
1387 | 1387 |
CONFIG_RPS=y |
1388 | 1388 |
CONFIG_RFS_ACCEL=y |
... | ... |
@@ -1950,6 +1950,7 @@ CONFIG_DUMMY=m |
1950 | 1950 |
# CONFIG_NET_TEAM is not set |
1951 | 1951 |
CONFIG_MACVLAN=m |
1952 | 1952 |
CONFIG_MACVTAP=m |
1953 |
+CONFIG_IPVLAN=m |
|
1953 | 1954 |
CONFIG_VXLAN=m |
1954 | 1955 |
CONFIG_GENEVE=m |
1955 | 1956 |
# CONFIG_GTP is not set |
... | ... |
@@ -1963,6 +1964,7 @@ CONFIG_TUN=m |
1963 | 1963 |
CONFIG_VETH=y |
1964 | 1964 |
CONFIG_VIRTIO_NET=y |
1965 | 1965 |
# CONFIG_NLMON is not set |
1966 |
+# CONFIG_NET_VRF is not set |
|
1966 | 1967 |
# CONFIG_ARCNET is not set |
1967 | 1968 |
|
1968 | 1969 |
# |
... | ... |
@@ -1165,7 +1165,7 @@ CONFIG_NET_MPLS_GSO=m |
1165 | 1165 |
# CONFIG_MPLS_ROUTING is not set |
1166 | 1166 |
# CONFIG_HSR is not set |
1167 | 1167 |
# CONFIG_NET_SWITCHDEV is not set |
1168 |
-# CONFIG_NET_L3_MASTER_DEV is not set |
|
1168 |
+CONFIG_NET_L3_MASTER_DEV=y |
|
1169 | 1169 |
# CONFIG_NET_NCSI is not set |
1170 | 1170 |
CONFIG_RPS=y |
1171 | 1171 |
CONFIG_RFS_ACCEL=y |
... | ... |
@@ -1599,6 +1599,7 @@ CONFIG_DUMMY=m |
1599 | 1599 |
# CONFIG_NET_TEAM is not set |
1600 | 1600 |
CONFIG_MACVLAN=m |
1601 | 1601 |
# CONFIG_MACVTAP is not set |
1602 |
+CONFIG_IPVLAN=m |
|
1602 | 1603 |
CONFIG_VXLAN=m |
1603 | 1604 |
CONFIG_GENEVE=m |
1604 | 1605 |
# CONFIG_GTP is not set |
... | ... |
@@ -1610,6 +1611,7 @@ CONFIG_TUN=m |
1610 | 1610 |
# CONFIG_TUN_VNET_CROSS_LE is not set |
1611 | 1611 |
CONFIG_VETH=m |
1612 | 1612 |
# CONFIG_NLMON is not set |
1613 |
+# CONFIG_NET_VRF is not set |
|
1613 | 1614 |
# CONFIG_ARCNET is not set |
1614 | 1615 |
|
1615 | 1616 |
# |
... | ... |
@@ -1351,7 +1351,7 @@ CONFIG_NET_MPLS_GSO=m |
1351 | 1351 |
# CONFIG_MPLS_ROUTING is not set |
1352 | 1352 |
# CONFIG_HSR is not set |
1353 | 1353 |
# CONFIG_NET_SWITCHDEV is not set |
1354 |
-# CONFIG_NET_L3_MASTER_DEV is not set |
|
1354 |
+CONFIG_NET_L3_MASTER_DEV=y |
|
1355 | 1355 |
# CONFIG_NET_NCSI is not set |
1356 | 1356 |
CONFIG_RPS=y |
1357 | 1357 |
CONFIG_RFS_ACCEL=y |
... | ... |
@@ -1916,6 +1916,7 @@ CONFIG_DUMMY=m |
1916 | 1916 |
# CONFIG_NET_TEAM is not set |
1917 | 1917 |
CONFIG_MACVLAN=m |
1918 | 1918 |
CONFIG_MACVTAP=m |
1919 |
+CONFIG_IPVLAN=m |
|
1919 | 1920 |
CONFIG_VXLAN=m |
1920 | 1921 |
CONFIG_GENEVE=m |
1921 | 1922 |
# CONFIG_GTP is not set |
... | ... |
@@ -1929,6 +1930,7 @@ CONFIG_TUN=m |
1929 | 1929 |
CONFIG_VETH=y |
1930 | 1930 |
CONFIG_VIRTIO_NET=y |
1931 | 1931 |
# CONFIG_NLMON is not set |
1932 |
+# CONFIG_NET_VRF is not set |
|
1932 | 1933 |
# CONFIG_ARCNET is not set |
1933 | 1934 |
|
1934 | 1935 |
# |
... | ... |
@@ -2,7 +2,7 @@ |
2 | 2 |
Summary: Kernel |
3 | 3 |
Name: linux-esx |
4 | 4 |
Version: 4.9.28 |
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 |
... | ... |
@@ -189,6 +189,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg |
189 | 189 |
/usr/src/linux-headers-%{uname_r} |
190 | 190 |
|
191 | 191 |
%changelog |
192 |
+* Wed May 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 4.9.28-2 |
|
193 |
+- Enable IPVLAN module. |
|
192 | 194 |
* Tue May 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.28-1 |
193 | 195 |
- .config: built ATA drivers in a kernel |
194 | 196 |
* Wed May 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.27-1 |
... | ... |
@@ -2,7 +2,7 @@ |
2 | 2 |
Summary: Kernel |
3 | 3 |
Name: linux-secure |
4 | 4 |
Version: 4.9.28 |
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 |
... | ... |
@@ -228,6 +228,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg |
228 | 228 |
/usr/src/linux-headers-%{uname_r} |
229 | 229 |
|
230 | 230 |
%changelog |
231 |
+* Wed May 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 4.9.28-2 |
|
232 |
+- Enable IPVLAN module. |
|
231 | 233 |
* Tue May 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.28-1 |
232 | 234 |
- Version update |
233 | 235 |
* Wed May 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.27-1 |
... | ... |
@@ -2,7 +2,7 @@ |
2 | 2 |
Summary: Kernel |
3 | 3 |
Name: linux |
4 | 4 |
Version: 4.9.28 |
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 |
... | ... |
@@ -42,7 +42,7 @@ Requires: filesystem kmod coreutils |
42 | 42 |
%define uname_r %{version}-%{release} |
43 | 43 |
|
44 | 44 |
%description |
45 |
-The Linux package contains the Linux kernel. |
|
45 |
+The Linux package contains the Linux kernel. |
|
46 | 46 |
|
47 | 47 |
|
48 | 48 |
%package devel |
... | ... |
@@ -81,12 +81,12 @@ Requires: %{name} = %{version}-%{release} |
81 | 81 |
Kernel driver for oprofile, a statistical profiler for Linux systems |
82 | 82 |
|
83 | 83 |
%package tools |
84 |
-Summary: This package contains the 'perf' performance analysis tools for Linux kernel |
|
84 |
+Summary: This package contains the 'perf' performance analysis tools for Linux kernel |
|
85 | 85 |
Group: System/Tools |
86 | 86 |
Requires: %{name} = %{version}-%{release} |
87 | 87 |
Requires: audit |
88 | 88 |
%description tools |
89 |
-This package contains the 'perf' performance analysis tools for Linux kernel. |
|
89 |
+This package contains the 'perf' performance analysis tools for Linux kernel. |
|
90 | 90 |
|
91 | 91 |
|
92 | 92 |
%prep |
... | ... |
@@ -248,11 +248,13 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg |
248 | 248 |
%exclude %{_libdir}/debug |
249 | 249 |
/usr/lib64/traceevent |
250 | 250 |
%{_bindir} |
251 |
-/etc/bash_completion.d/* |
|
251 |
+/etc/bash_completion.d/* |
|
252 | 252 |
/usr/share/perf-core/strace/groups/file |
253 | 253 |
/usr/share/doc/* |
254 | 254 |
|
255 | 255 |
%changelog |
256 |
+* Wed May 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 4.9.28-2 |
|
257 |
+- Enable IPVLAN module. |
|
256 | 258 |
* Tue May 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.28-1 |
257 | 259 |
- Version update |
258 | 260 |
* Wed May 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.27-1 |
... | ... |
@@ -324,7 +326,7 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg |
324 | 324 |
- Rename -dev subpackage to -devel |
325 | 325 |
* Wed Sep 7 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-1 |
326 | 326 |
- Update to linux-4.4.20 |
327 |
-- apparmor-fix-oops-validate-buffer-size-in-apparmor_setprocattr.patch |
|
327 |
+- apparmor-fix-oops-validate-buffer-size-in-apparmor_setprocattr.patch |
|
328 | 328 |
- keys-fix-asn.1-indefinite-length-object-parsing.patch |
329 | 329 |
* Thu Aug 25 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-11 |
330 | 330 |
- vmxnet3 patches to bumpup a version to 1.4.8.0 |
... | ... |
@@ -338,7 +340,7 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg |
338 | 338 |
- patch: e1000e-prevent-div-by-zero-if-TIMINCA-is-zero.patch |
339 | 339 |
- .config: disable rt group scheduling - not supported by systemd |
340 | 340 |
* Wed Jun 15 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.4.8-7 |
341 |
-- fixed the capitalization for - System.map |
|
341 |
+- fixed the capitalization for - System.map |
|
342 | 342 |
* Thu May 26 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-6 |
343 | 343 |
- patch: REVERT-sched-fair-Beef-up-wake_wide.patch |
344 | 344 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.8-5 |
... | ... |
@@ -415,7 +417,7 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg |
415 | 415 |
* Mon Nov 09 2015 Vinay Kulkarni <kulkarniv@vmware.com> 4.2.0-2 |
416 | 416 |
- Enable Geneve module support for generic kernel. |
417 | 417 |
* Fri Oct 23 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-1 |
418 |
-- Upgraded the generic linux kernel to version 4.2.0 & and updated timer handling to full tickless mode. |
|
418 |
+- Upgraded the generic linux kernel to version 4.2.0 & and updated timer handling to full tickless mode. |
|
419 | 419 |
* Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.0.9-5 |
420 | 420 |
- Added driver support for frame buffer devices and ACPI |
421 | 421 |
* Wed Sep 2 2015 Alexey Makhalov <amakhalov@vmware.com> 4.0.9-4 |
... | ... |
@@ -431,7 +433,7 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg |
431 | 431 |
- Rename -gpu-drivers to -drivers-gpu in accordance to directory structure. |
432 | 432 |
- Added -sound package/ |
433 | 433 |
* Tue Aug 11 2015 Anish Swaminathan<anishs@vmware.com> 3.19.2-4 |
434 |
-- Removed Requires dependencies. |
|
434 |
+- Removed Requires dependencies. |
|
435 | 435 |
* Fri Jul 24 2015 Harish Udaiya Kumar <hudaiyakumar@gmail.com> 3.19.2-3 |
436 | 436 |
- Updated the config file to include graphics drivers. |
437 | 437 |
* Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 3.13.3-2 |