Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584eb947 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.80 into android-4.14-p 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f9cf23e1 0b047cbc

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();