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

Commit 143eeb9a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.220 into android-4.19-stable 



Changes in 4.19.220
	shm: extend forced shm destroy to support objects from several IPC nses
	NFSv42: Fix pagecache invalidation after COPY/CLONE
	of: clk: Make <linux/of_clk.h> self-contained
	gfs2: Fix length of holes reported at end-of-file
	atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_wait
	net: return correct error code
	platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep
	s390/setup: avoid using memblock_enforce_memory_limit
	btrfs: check-integrity: fix a warning on write caching disabled disk
	thermal: core: Reset previous low and high trip during thermal zone init
	scsi: iscsi: Unblock session then wake up error handler
	ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile
	ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port()
	net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound
	net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock()
	perf hist: Fix memory leak of a perf_hpp_fmt
	vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit
	kprobes: Limit max data_size of the kretprobe instances
	ipmi: Move remove_work to dedicated workqueue
	sata_fsl: fix UAF in sata_fsl_port_stop when rmmod sata_fsl
	sata_fsl: fix warning in remove_proc_entry when rmmod sata_fsl
	fs: add fget_many() and fput_many()
	fget: check that the fd still exists after getting a ref to it
	i2c: stm32f7: recover the bus on access timeout
	i2c: stm32f7: stop dma transfer in case of NACK
	natsemi: xtensa: fix section mismatch warnings
	net: qlogic: qlcnic: Fix a NULL pointer dereference in qlcnic_83xx_add_rings()
	net: mpls: Fix notifications when deleting a device
	siphash: use _unaligned version by default
	net/mlx4_en: Fix an use-after-free bug in mlx4_en_try_alloc_resources()
	rxrpc: Fix rxrpc_local leak in rxrpc_lookup_peer()
	net: usb: lan78xx: lan78xx_phy_init(): use PHY_POLL instead of "0" if no IRQ is available
	net: annotate data-races on txq->xmit_lock_owner
	net/rds: correct socket tunable error in rds_tcp_tune()
	net/smc: Keep smc_close_final rc during active close
	drm/msm: Do hw_init() before capturing GPU state
	parisc: Fix KBUILD_IMAGE for self-extracting kernel
	parisc: Fix "make install" on newer debian releases
	vgacon: Propagate console boot parameters before calling `vc_resize'
	xhci: Fix commad ring abort, write all 64 bits to CRCR register.
	USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub
	usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect
	x86/64/mm: Map all kernel memory into trampoline_pgd
	tty: serial: msm_serial: Deactivate RX DMA for polling support
	serial: pl011: Add ACPI SBSA UART match id
	serial: core: fix transmit-buffer reset and memleak
	parisc: Mark cr16 CPU clocksource unstable on all SMP machines
	ipmi: msghandler: Make symbol 'remove_work_wq' static
	Linux 4.19.220

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie45b16f07f333542a48d2ebdf780ea4170f9741e
parents d8aa9b09 bcd694e3

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 219

SUBLEVEL = 220

EXTRAVERSION =

NAME = "People's Front"

arch/parisc/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -17,7 +17,12 @@ 
# Mike Shaver, Helge Deller and Martin K. Petersen

#



ifdef CONFIG_PARISC_SELF_EXTRACT

boot := arch/parisc/boot

KBUILD_IMAGE := $(boot)/bzImage

else

KBUILD_IMAGE := vmlinuz

endif



KBUILD_DEFCONFIG := default_defconfig

arch/parisc/install.sh

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ verify "$3" 
if [ -n "${INSTALLKERNEL}" ]; then

  if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

  if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi

  if [ -x /usr/sbin/${INSTALLKERNEL} ]; then exec /usr/sbin/${INSTALLKERNEL} "$@"; fi

fi



# Default install

arch/parisc/kernel/time.c

+5 −19
Original line number Diff line number Diff line
@@ -245,27 +245,13 @@ void __init time_init(void) 
static int __init init_cr16_clocksource(void)

{

	/*

	 * The cr16 interval timers are not syncronized across CPUs on

	 * different sockets, so mark them unstable and lower rating on

	 * multi-socket SMP systems.

	 * The cr16 interval timers are not syncronized across CPUs, even if

	 * they share the same socket.

	 */

	if (num_online_cpus() > 1 && !running_on_qemu) {

		int cpu;

		unsigned long cpu0_loc;

		cpu0_loc = per_cpu(cpu_data, 0).cpu_loc;



		for_each_online_cpu(cpu) {

			if (cpu == 0)

				continue;

			if ((cpu0_loc != 0) &&

			    (cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))

				continue;



		clocksource_cr16.name = "cr16_unstable";

		clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;

		clocksource_cr16.rating = 0;

			break;

		}

	}



	/* XXX: We may want to mark sched_clock stable here if cr16 clocks are

arch/s390/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -703,9 +703,6 @@ static void __init setup_memory(void) 
		storage_key_init_range(reg->base, reg->base + reg->size);

	}

	psw_set_key(PAGE_DEFAULT_KEY);



	/* Only cosmetics */

	memblock_enforce_memory_limit(memblock_end_of_DRAM());

}



/*