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

Commit 19d4991a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.175 into android-4.19-stable 



Changes in 4.19.175
	USB: serial: cp210x: add pid/vid for WSDA-200-USB
	USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
	USB: serial: option: Adding support for Cinterion MV31
	elfcore: fix building with clang
	Input: i8042 - unbreak Pegatron C15B
	rxrpc: Fix deadlock around release of dst cached on udp tunnel
	arm64: dts: ls1046a: fix dcfg address range
	net: lapb: Copy the skb before sending a packet
	net: mvpp2: TCAM entry enable should be written after SRAM data
	memblock: do not start bottom-up allocations with kernel_end
	USB: gadget: legacy: fix an error code in eth_bind()
	USB: usblp: don't call usb_set_interface if there's a single alt
	usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop()
	usb: dwc2: Fix endpoint direction check in ep_from_windex
	usb: dwc3: fix clock issue during resume in OTG mode
	ovl: fix dentry leak in ovl_get_redirect
	mac80211: fix station rate table updates on assoc
	kretprobe: Avoid re-registration of the same kretprobe earlier
	genirq/msi: Activate Multi-MSI early when MSI_FLAG_ACTIVATE_EARLY is set
	xhci: fix bounce buffer usage for non-sg list case
	cifs: report error instead of invalid when revalidating a dentry fails
	smb3: Fix out-of-bounds bug in SMB2_negotiate()
	mmc: core: Limit retries when analyse of SDIO tuples fails
	nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs
	KVM: SVM: Treat SVM as unsupported when running as an SEV guest
	ARM: footbridge: fix dc21285 PCI configuration accessors
	mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
	mm: hugetlb: fix a race between freeing and dissolving the page
	mm: hugetlb: fix a race between isolating and freeing page
	mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
	mm: thp: fix MADV_REMOVE deadlock on shmem THP
	x86/build: Disable CET instrumentation in the kernel
	x86/apic: Add extra serialization for non-serializing MSRs
	Input: xpad - sync supported devices with fork on GitHub
	iommu/vt-d: Do not use flush-queue when caching-mode is on
	md: Set prev_flush_start and flush_bio in an atomic way
	net: ip_tunnel: fix mtu calculation
	net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add
	Linux 4.19.175

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Iac6d5c4ad079946ef1c032791e8e583b9264917b
parents 06931a5d 54354bc5

Makefile

+1 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 174

SUBLEVEL = 175

EXTRAVERSION =

NAME = "People's Front"
@@ -952,12 +952,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) 
# change __FILE__ to the relative path from the srctree

KBUILD_CFLAGS	+= $(call cc-option,-fmacro-prefix-map=$(srctree)/=)



# ensure -fcf-protection is disabled when using retpoline as it is

# incompatible with -mindirect-branch=thunk-extern

ifdef CONFIG_RETPOLINE

KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)

endif



# use the deterministic mode of AR if available

KBUILD_ARFLAGS := $(call ar-option,D)

arch/arm/mach-footbridge/dc21285.c

+6 −6
Original line number Diff line number Diff line
@@ -69,15 +69,15 @@ dc21285_read_config(struct pci_bus *bus, unsigned int devfn, int where, 
	if (addr)

		switch (size) {

		case 1:

			asm("ldrb	%0, [%1, %2]"

			asm volatile("ldrb	%0, [%1, %2]"

				: "=r" (v) : "r" (addr), "r" (where) : "cc");

			break;

		case 2:

			asm("ldrh	%0, [%1, %2]"

			asm volatile("ldrh	%0, [%1, %2]"

				: "=r" (v) : "r" (addr), "r" (where) : "cc");

			break;

		case 4:

			asm("ldr	%0, [%1, %2]"

			asm volatile("ldr	%0, [%1, %2]"

				: "=r" (v) : "r" (addr), "r" (where) : "cc");

			break;

		}
@@ -103,17 +103,17 @@ dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where, 
	if (addr)

		switch (size) {

		case 1:

			asm("strb	%0, [%1, %2]"

			asm volatile("strb	%0, [%1, %2]"

				: : "r" (value), "r" (addr), "r" (where)

				: "cc");

			break;

		case 2:

			asm("strh	%0, [%1, %2]"

			asm volatile("strh	%0, [%1, %2]"

				: : "r" (value), "r" (addr), "r" (where)

				: "cc");

			break;

		case 4:

			asm("str	%0, [%1, %2]"

			asm volatile("str	%0, [%1, %2]"

				: : "r" (value), "r" (addr), "r" (where)

				: "cc");

			break;

arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ 


		dcfg: dcfg@1ee0000 {

			compatible = "fsl,ls1046a-dcfg", "syscon";

			reg = <0x0 0x1ee0000 0x0 0x10000>;

			reg = <0x0 0x1ee0000 0x0 0x1000>;

			big-endian;

		};

arch/x86/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ else 
        KBUILD_CFLAGS += -mno-red-zone

        KBUILD_CFLAGS += -mcmodel=kernel



	# Intel CET isn't enabled in the kernel

	KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)



        # -funit-at-a-time shrinks the kernel .text considerably

        # unfortunately it makes reading oopses harder.

        KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)

arch/x86/include/asm/apic.h

+0 −10
Original line number Diff line number Diff line
@@ -190,16 +190,6 @@ static inline void lapic_assign_legacy_vector(unsigned int i, bool r) { } 
#endif /* !CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_X86_X2APIC

/*

 * Make previous memory operations globally visible before

 * sending the IPI through x2apic wrmsr. We need a serializing instruction or

 * mfence for this.

 */

static inline void x2apic_wrmsr_fence(void)

{

	asm volatile("mfence" : : : "memory");

}



static inline void native_apic_msr_write(u32 reg, u32 v)

{

	if (reg == APIC_DFR || reg == APIC_ID || reg == APIC_LDR ||