Merge android-4.14-p.80 (584eb94) into msm-4.14 (2f4158f9) · Commits · e / devices / android_kernel_oneplus_sm8150

* refs/heads/tmp-: Linux 4.14.80 net: fs_enet: do not call phy_stop() in interrupts x86/fpu: Fix i486 + no387 boot crash by only saving FPU registers on context switch if there is an FPU x86/time: Correct the attribute on jiffies' definition x86/percpu: Fix this_cpu_read() x86, hibernate: Fix nosave_regions setup for hibernation x86/tsc: Force inlining of cyc2ns bits sched/fair: Fix throttle_list starvation with low CFS quota Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM USB: fix the usbfs flag sanitization for control transfers usb: gadget: storage: Fix Spectre v1 vulnerability usb: usbip: Fix BUG: KASAN: slab-out-of-bounds in vhci_hub_control() cdc-acm: fix race between reset and control messaging cdc-acm: correct counting of UART states in serial state notification cdc-acm: do not reset notification buffer index upon urb unlinking IB/ucm: Fix Spectre v1 vulnerability RDMA/ucma: Fix Spectre v1 vulnerability drm: fb-helper: Reject all pixel format changing requests drm/edid: VSDB yCBCr420 Deep Color mode bit definitions drm/edid: Add 6 bpc quirk for BOE panel in HP Pavilion 15-n233sl ptp: fix Spectre v1 vulnerability cachefiles: fix the race between cachefiles_bury_object() and rmdir(2) xfs: truncate transaction does not modify the inobt gpio: mxs: Get rid of external API call fsnotify: fix ignore mask logic in fsnotify() Revert "ARM: tegra: Fix ULPI regression on Tegra20" bpf: fix partial copy of map_ptr when dst is scalar USB: serial: option: add two-endpoints device-id flag USB: serial: option: improve Quectel EP06 detection vfs: swap names of {do,vfs}_clone_file_range() eeprom: at24: Add support for address-width property Change-Id: Icc899f8e774106a4166542e0f698165a4f5a08bd Signed-off-by:

Blagovest Kolenichev <bkolenichev@codeaurora.org>

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 79
		SUBLEVEL = 80
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arm/boot/dts/tegra20.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -706,7 +706,7 @@
		phy_type = "ulpi";
		clocks = <&tegra_car TEGRA20_CLK_USB2>,
		<&tegra_car TEGRA20_CLK_PLL_U>,
		<&tegra_car TEGRA20_CLK_PLL_P_OUT4>;
		<&tegra_car TEGRA20_CLK_CDEV2>;
		clock-names = "reg", "pll_u", "ulpi-link";
		resets = <&tegra_car 58>, <&tegra_car 22>;
		reset-names = "usb", "utmi-pads";

arch/x86/include/asm/fpu/internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ static inline void fpregs_activate(struct fpu *fpu)
		static inline void
		switch_fpu_prepare(struct fpu *old_fpu, int cpu)
		{
		if (old_fpu->initialized) {
		if (static_cpu_has(X86_FEATURE_FPU) && old_fpu->initialized) {
		if (!copy_fpregs_to_fpstate(old_fpu))
		old_fpu->last_cpu = -1;
		else

arch/x86/include/asm/percpu.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -185,22 +185,22 @@ do { \
		typeof(var) pfo_ret__; \
		switch (sizeof(var)) { \
		case 1: \
		asm(op "b "__percpu_arg(1)",%0" \
		asm volatile(op "b "__percpu_arg(1)",%0"\
		: "=q" (pfo_ret__) \
		: "m" (var)); \
		break; \
		case 2: \
		asm(op "w "__percpu_arg(1)",%0" \
		asm volatile(op "w "__percpu_arg(1)",%0"\
		: "=r" (pfo_ret__) \
		: "m" (var)); \
		break; \
		case 4: \
		asm(op "l "__percpu_arg(1)",%0" \
		asm volatile(op "l "__percpu_arg(1)",%0"\
		: "=r" (pfo_ret__) \
		: "m" (var)); \
		break; \
		case 8: \
		asm(op "q "__percpu_arg(1)",%0" \
		asm volatile(op "q "__percpu_arg(1)",%0"\
		: "=r" (pfo_ret__) \
		: "m" (var)); \
		break; \

arch/x86/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1287,7 +1287,7 @@ void __init setup_arch(char **cmdline_p)
		kvm_guest_init();

		e820__reserve_resources();
		e820__register_nosave_regions(max_low_pfn);
		e820__register_nosave_regions(max_pfn);

		x86_init.resources.reserve_resources();