1. photon
  2. Commit f1f04b8ba24f0af1ea08b89112cd4e98ea08dd25
Browse code

kernels: Update to version 4.4.139

Extras:
- Enable support for USB_SERIAL in linux-esx
- Enable USB_ACM support in all kernels
- Compile-in the vmxnet3 driver in linux-esx

Change-Id: Iecf0ad17a17ffb14bdb38bbc60250af94bb14e71
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5322
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Srivatsa S. Bhat authored on 2018/07/04 08:58:47
Showing 6 changed files
SPECS/linux-api-headers/linux-api-headers.spec
History View file @ f1f04b8
... ... 
@@ -1,6 +1,6 @@
1 1 
 Summary:	Linux API header files
2 2 
 Name:		linux-api-headers
3 
-Version:	4.4.138
3 
+Version:	4.4.139
4 4 
 Release:	1%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		http://www.kernel.org/
... ... 
@@ -8,7 +8,7 @@ Group:		System Environment/Kernel
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: Photon
10 10 
 Source0:    	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
11 
-%define sha1 linux=f1d6778e011fb07d7d4df12262f790f053e78e27
11 
+%define sha1 linux=ce4028904ab97c1942cc1c1b917520065529dc34
12 12 
 BuildArch:	noarch
13 13 
 # From SPECS/linux and used by linux-esx only
14 14 
 # It provides f*xattrat syscalls
... ... 
@@ -29,6 +29,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de
29 29 
 %defattr(-,root,root)
30 30 
 %{_includedir}/*
31 31 
 %changelog
32 
+*   Tue Jul 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.139-1
33 
+-   Update to version 4.4.139
32 34 
 *   Mon Jun 25 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.138-1
33 35 
 -   Update to version 4.4.138
34 36 
 *   Wed Jun 13 2018 Alexey Makhalov <amakhalov@vmware.com> 4.4.137-1
SPECS/linux/config
History View file @ f1f04b8
... ... 
@@ -1,6 +1,6 @@
1 1 
 #
2 2 
 # Automatically generated file; DO NOT EDIT.
3 
-# Linux/x86 4.4.113 Kernel Configuration
3 
+# Linux/x86 4.4.139 Kernel Configuration
4 4 
 #
5 5 
 CONFIG_64BIT=y
6 6 
 CONFIG_X86_64=y
... ... 
@@ -3201,7 +3201,7 @@ CONFIG_USB_HCD_SSB=m
3201 3201 
 #
3202 3202 
 # USB Device Class drivers
3203 3203 
 #
3204 
-# CONFIG_USB_ACM is not set
3204 
+CONFIG_USB_ACM=m
3205 3205 
 # CONFIG_USB_PRINTER is not set
3206 3206 
 # CONFIG_USB_WDM is not set
3207 3207 
 # CONFIG_USB_TMC is not set
SPECS/linux/config-esx
History View file @ f1f04b8
... ... 
@@ -1,6 +1,6 @@
1 1 
 #
2 2 
 # Automatically generated file; DO NOT EDIT.
3 
-# Linux/x86 4.4.113 Kernel Configuration
3 
+# Linux/x86 4.4.139 Kernel Configuration
4 4 
 #
5 5 
 CONFIG_64BIT=y
6 6 
 CONFIG_X86_64=y
... ... 
@@ -1646,7 +1646,7 @@ CONFIG_E1000E=m
1646 1646 
 # Enable WiMAX (Networking options) to see the WiMAX drivers
1647 1647 
 #
1648 1648 
 # CONFIG_WAN is not set
1649 
-CONFIG_VMXNET3=m
1649 
+CONFIG_VMXNET3=y
1650 1650 
 # CONFIG_FUJITSU_ES is not set
1651 1651 
 # CONFIG_ISDN is not set
1652 1652 
 # CONFIG_NVM is not set
... ... 
@@ -2254,7 +2254,7 @@ CONFIG_USB_UHCI_HCD=m
2254 2254 
 #
2255 2255 
 # USB Device Class drivers
2256 2256 
 #
2257 
-# CONFIG_USB_ACM is not set
2257 
+CONFIG_USB_ACM=m
2258 2258 
 # CONFIG_USB_PRINTER is not set
2259 2259 
 # CONFIG_USB_WDM is not set
2260 2260 
 # CONFIG_USB_TMC is not set
... ... 
@@ -2298,7 +2298,57 @@ CONFIG_USB_STORAGE=m
2298 2298 
 #
2299 2299 
 # USB port drivers
2300 2300 
 #
2301 
-# CONFIG_USB_SERIAL is not set
2301 
+CONFIG_USB_SERIAL=m
2302 
+CONFIG_USB_SERIAL_GENERIC=y
2303 
+# CONFIG_USB_SERIAL_SIMPLE is not set
2304 
+# CONFIG_USB_SERIAL_AIRCABLE is not set
2305 
+# CONFIG_USB_SERIAL_ARK3116 is not set
2306 
+# CONFIG_USB_SERIAL_BELKIN is not set
2307 
+# CONFIG_USB_SERIAL_CH341 is not set
2308 
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
2309 
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
2310 
+CONFIG_USB_SERIAL_CP210X=m
2311 
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
2312 
+# CONFIG_USB_SERIAL_EMPEG is not set
2313 
+CONFIG_USB_SERIAL_FTDI_SIO=m
2314 
+# CONFIG_USB_SERIAL_VISOR is not set
2315 
+# CONFIG_USB_SERIAL_IPAQ is not set
2316 
+# CONFIG_USB_SERIAL_IR is not set
2317 
+# CONFIG_USB_SERIAL_EDGEPORT is not set
2318 
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
2319 
+# CONFIG_USB_SERIAL_F81232 is not set
2320 
+# CONFIG_USB_SERIAL_GARMIN is not set
2321 
+# CONFIG_USB_SERIAL_IPW is not set
2322 
+# CONFIG_USB_SERIAL_IUU is not set
2323 
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
2324 
+# CONFIG_USB_SERIAL_KEYSPAN is not set
2325 
+# CONFIG_USB_SERIAL_KLSI is not set
2326 
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
2327 
+# CONFIG_USB_SERIAL_MCT_U232 is not set
2328 
+# CONFIG_USB_SERIAL_METRO is not set
2329 
+# CONFIG_USB_SERIAL_MOS7720 is not set
2330 
+# CONFIG_USB_SERIAL_MOS7840 is not set
2331 
+# CONFIG_USB_SERIAL_MXUPORT is not set
2332 
+# CONFIG_USB_SERIAL_NAVMAN is not set
2333 
+# CONFIG_USB_SERIAL_PL2303 is not set
2334 
+# CONFIG_USB_SERIAL_OTI6858 is not set
2335 
+# CONFIG_USB_SERIAL_QCAUX is not set
2336 
+# CONFIG_USB_SERIAL_QUALCOMM is not set
2337 
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
2338 
+# CONFIG_USB_SERIAL_SAFE is not set
2339 
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
2340 
+# CONFIG_USB_SERIAL_SYMBOL is not set
2341 
+# CONFIG_USB_SERIAL_TI is not set
2342 
+# CONFIG_USB_SERIAL_CYBERJACK is not set
2343 
+# CONFIG_USB_SERIAL_XIRCOM is not set
2344 
+# CONFIG_USB_SERIAL_OPTION is not set
2345 
+# CONFIG_USB_SERIAL_OMNINET is not set
2346 
+# CONFIG_USB_SERIAL_OPTICON is not set
2347 
+# CONFIG_USB_SERIAL_XSENS_MT is not set
2348 
+# CONFIG_USB_SERIAL_WISHBONE is not set
2349 
+# CONFIG_USB_SERIAL_SSU100 is not set
2350 
+# CONFIG_USB_SERIAL_QT2 is not set
2351 
+# CONFIG_USB_SERIAL_DEBUG is not set
2302 2352
2303 2353 
 #
2304 2354 
 # USB Miscellaneous drivers
SPECS/linux/linux-esx.spec
History View file @ f1f04b8
... ... 
@@ -1,15 +1,15 @@
1 1 
 %global security_hardening none
2 2 
 Summary:       Kernel
3 3 
 Name:          linux-esx
4 
-Version:       4.4.138
5 
-Release:       2%{?dist}
4 
+Version:       4.4.139
5 
+Release:       1%{?dist}
6 6 
 License:       GPLv2
7 7 
 URL:           http://www.kernel.org/
8 8 
 Group:         System Environment/Kernel
9 9 
 Vendor:        VMware, Inc.
10 10 
 Distribution:  Photon
11 11 
 Source0:       http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
12 
-%define sha1 linux=f1d6778e011fb07d7d4df12262f790f053e78e27
12 
+%define sha1 linux=ce4028904ab97c1942cc1c1b917520065529dc34
13 13 
 Source1:       config-esx
14 14 
 Patch0:        double-tcp_mem-limits.patch
15 15 
 Patch1:        linux-4.4-sysctl-sched_weighted_cpuload_uses_rla.patch
... ... 
@@ -442,6 +442,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
442 442 
 /usr/src/linux-headers-%{uname_r}
443 443
444 444 
 %changelog
445 
+*   Tue Jul 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.139-1
446 
+-   Update to version 4.4.139
445 447 
 *   Thu Jun 28 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.138-2
446 448 
 -   Add rdrand-based RNG driver to enhance kernel entropy.
447 449 
 *   Mon Jun 25 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.138-1
SPECS/linux/linux.spec
History View file @ f1f04b8
... ... 
@@ -1,15 +1,15 @@
1 1 
 %global security_hardening none
2 2 
 Summary:        Kernel
3 3 
 Name:           linux
4 
-Version:    	4.4.138
5 
-Release:        2%{?kat_build:.%kat_build}%{?dist}
4 
+Version:    	4.4.139
5 
+Release:        1%{?kat_build:.%kat_build}%{?dist}
6 6 
 License:    	GPLv2
7 7 
 URL:        	http://www.kernel.org/
8 8 
 Group:        	System Environment/Kernel
9 9 
 Vendor:         VMware, Inc.
10 10 
 Distribution: 	Photon
11 11 
 Source0:    	http://www.kernel.org/pub/linux/kernel/v4.x/%{name}-%{version}.tar.xz
12 
-%define sha1 linux=f1d6778e011fb07d7d4df12262f790f053e78e27
12 
+%define sha1 linux=ce4028904ab97c1942cc1c1b917520065529dc34
13 13 
 Source1:	config
14 14 
 %define ena_version 1.1.3
15 15 
 Source2:    	https://github.com/amzn/amzn-drivers/archive/ena_linux_1.1.3.tar.gz
... ... 
@@ -541,6 +541,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
541 541 
 /usr/share/perf-core
542 542
543 543 
 %changelog
544 
+*   Tue Jul 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.139-1
545 
+-   Update to version 4.4.139
544 546 
 *   Thu Jun 28 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.138-2
545 547 
 -   Add rdrand-based RNG driver to enhance kernel entropy.
546 548 
 *   Mon Jun 25 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.138-1
SPECS/linux/speculative-store-bypass/0040-x86-speculation-Fix-up-array_index_nospec_mask-asm-c.patch
History View file @ f1f04b8
... ... 
@@ -23,12 +23,12 @@ Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu>
23 23 
  1 file changed, 1 insertion(+), 1 deletion(-)
24 24
25 25 
 diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
26 
-index 814ef83..c6975e3 100644
26 
+index e3a6f66..7f5dcb6 100644
27 27 
 --- a/arch/x86/include/asm/barrier.h
28 28 
 +++ b/arch/x86/include/asm/barrier.h
29 29 
 @@ -40,7 +40,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
30 30
31 
- 	asm ("cmp %1,%2; sbb %0,%0;"
31 
+ 	asm volatile ("cmp %1,%2; sbb %0,%0;"
32 32 
  			:"=r" (mask)
33 33 
 -			:"r"(size),"r" (index)
34 34 
 +			:"g"(size),"r" (index)