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

Commit 0b8c61c4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.147 into android-4.19-stable 



Changes in 4.19.147
	dsa: Allow forwarding of redirected IGMP traffic
	scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed
	scsi: qla2xxx: Move rport registration out of internal work_list
	scsi: qla2xxx: Reduce holding sess_lock to prevent CPU lock-up
	gfs2: initialize transaction tr_ailX_lists earlier
	RDMA/bnxt_re: Restrict the max_gids to 256
	net: handle the return value of pskb_carve_frag_list() correctly
	hv_netvsc: Remove "unlikely" from netvsc_select_queue
	NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall
	scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort
	scsi: libfc: Fix for double free()
	scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery
	regulator: pwm: Fix machine constraints application
	spi: spi-loopback-test: Fix out-of-bounds read
	NFS: Zero-stateid SETATTR should first return delegation
	SUNRPC: stop printk reading past end of string
	rapidio: Replace 'select' DMAENGINES 'with depends on'
	openrisc: Fix cache API compile issue when not inlining
	nvme-fc: cancel async events before freeing event struct
	nvme-rdma: cancel async events before freeing event struct
	f2fs: fix indefinite loop scanning for free nid
	f2fs: Return EOF on unaligned end of file DIO read
	i2c: algo: pca: Reapply i2c bus settings after reset
	spi: Fix memory leak on splited transfers
	KVM: MIPS: Change the definition of kvm type
	clk: davinci: Use the correct size when allocating memory
	clk: rockchip: Fix initialization of mux_pll_src_4plls_p
	ASoC: qcom: Set card->owner to avoid warnings
	Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload
	perf test: Fix the "signal" test inline assembly
	MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT
	perf test: Free formats for perf pmu parse test
	fbcon: Fix user font detection test at fbcon_resize().
	MIPS: SNI: Fix spurious interrupts
	drm/mediatek: Add exception handing in mtk_drm_probe() if component init fail
	drm/mediatek: Add missing put_device() call in mtk_hdmi_dt_parse_pdata()
	USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook
	USB: UAS: fix disconnect by unplugging a hub
	usblp: fix race between disconnect() and read()
	i2c: i801: Fix resume bug
	Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO"
	percpu: fix first chunk size calculation for populated bitmap
	Input: trackpoint - add new trackpoint variant IDs
	Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists
	serial: 8250_pci: Add Realtek 816a and 816b
	x86/boot/compressed: Disable relocation relaxation
	ehci-hcd: Move include to keep CRC stable
	powerpc/dma: Fix dma_map_ops::get_required_mask
	x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y
	Linux 4.19.147

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1c512021698db2701c51491a813bec79bda6bbf5
parents 17670c1a d09b8017

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 146

SUBLEVEL = 147

EXTRAVERSION =

NAME = "People's Front"

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -854,6 +854,7 @@ config SNI_RM 
	select I8253

	select I8259

	select ISA

	select MIPS_L1_CACHE_SHIFT_6

	select SWAP_IO_SPACE if CPU_BIG_ENDIAN

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000

arch/mips/kvm/mips.c

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ void kvm_arch_check_processor_compat(void *rtn) 
int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)

{

	switch (type) {

	case KVM_VM_MIPS_AUTO:

		break;

#ifdef CONFIG_KVM_MIPS_VZ

	case KVM_VM_MIPS_VZ:

#else

arch/mips/sni/a20r.c

+7 −2
Original line number Diff line number Diff line
@@ -143,7 +143,10 @@ static struct platform_device sc26xx_pdev = { 
	},

};



static u32 a20r_ack_hwint(void)

/*

 * Trigger chipset to update CPU's CAUSE IP field

 */

static u32 a20r_update_cause_ip(void)

{

	u32 status = read_c0_status();
@@ -205,12 +208,14 @@ static void a20r_hwint(void) 
	int irq;



	clear_c0_status(IE_IRQ0);

	status = a20r_ack_hwint();

	status = a20r_update_cause_ip();

	cause = read_c0_cause();



	irq = ffs(((cause & status) >> 8) & 0xf8);

	if (likely(irq > 0))

		do_IRQ(SNI_A20R_IRQ_BASE + irq - 1);



	a20r_update_cause_ip();

	set_c0_status(IE_IRQ0);

}

arch/openrisc/mm/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/cacheflush.h>

#include <asm/tlbflush.h>



static void cache_loop(struct page *page, const unsigned int reg)

static __always_inline void cache_loop(struct page *page, const unsigned int reg)

{

	unsigned long paddr = page_to_pfn(page) << PAGE_SHIFT;

	unsigned long line = paddr & ~(L1_CACHE_BYTES - 1);