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

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

Merge 4.19.292 into android-4.19-stable 



Changes in 4.19.292
	sparc: fix up arch_cpu_finalize_init() build breakage.
	mmc: moxart: read scr register without changing byte order
	ipv6: adjust ndisc_is_useropt() to also return true for PIO
	dmaengine: pl330: Return DMA_PAUSED when transaction is paused
	drm/nouveau/gr: enable memory loads on helper invocation on all channels
	radix tree test suite: fix incorrect allocation size for pthreads
	nilfs2: fix use-after-free of nilfs_root in dirtying inodes via iput
	iio: cros_ec: Fix the allocation size for cros_ec_command
	binder: fix memory leak in binder_init()
	usb-storage: alauda: Fix uninit-value in alauda_check_media()
	usb: dwc3: Properly handle processing of pending events
	x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405
	x86/mm: Fix VDSO and VVAR placement on 5-level paging machines
	x86: Move gds_ucode_mitigated() declaration to header
	drm/nouveau/disp: Revert a NULL check inside nouveau_connector_get_modes
	mISDN: Update parameter type of dsp_cmx_send()
	net/packet: annotate data-races around tp->status
	bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves
	dccp: fix data-race around dp->dccps_mss_cache
	drivers: net: prevent tun_build_skb() to exceed the packet size limit
	IB/hfi1: Fix possible panic during hotplug remove
	wifi: cfg80211: fix sband iftype data lookup for AP_VLAN
	ibmvnic: Handle DMA unmapping of login buffs in release functions
	btrfs: don't stop integrity writeback too early
	netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush
	netfilter: nf_tables: report use refcount overflow
	scsi: core: Fix legacy /proc parsing buffer overflow
	scsi: storvsc: Fix handling of virtual Fibre Channel timeouts
	scsi: 53c700: Check that command slot is not NULL
	scsi: snic: Fix possible memory leak if device_add() fails
	scsi: core: Fix possible memory leak if device_add() fails
	alpha: remove __init annotation from exported page_is_ram()
	sch_netem: fix issues in netem_change() vs get_dist_table()
	Linux 4.19.292

Change-Id: Ie4a1393c672e280631d9a0949e081f134dff3e3b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 38ed8930 4e5e7fa9

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 291

SUBLEVEL = 292

EXTRAVERSION =

NAME = "People's Front"

arch/alpha/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -469,8 +469,7 @@ setup_memory(void *kernel_end) 
extern void setup_memory(void *);

#endif /* !CONFIG_DISCONTIGMEM */



int __init

page_is_ram(unsigned long pfn)

int page_is_ram(unsigned long pfn)

{

	struct memclust_struct * cluster;

	struct memdesc_struct * memdesc;

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ config 64BIT 
config SPARC

	bool

	default y

	select ARCH_HAS_CPU_FINALIZE_INIT if !SMP

	select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI

	select ARCH_MIGHT_HAVE_PC_SERIO

	select OF
@@ -51,6 +50,7 @@ config SPARC 


config SPARC32

	def_bool !64BIT

	select ARCH_HAS_CPU_FINALIZE_INIT if !SMP

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select DMA_NONCOHERENT_OPS

	select GENERIC_ATOMIC64

arch/x86/entry/vdso/vma.c

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ static unsigned long vdso_addr(unsigned long start, unsigned len) 


	/* Round the lowest possible end address up to a PMD boundary. */

	end = (start + len + PMD_SIZE - 1) & PMD_MASK;

	if (end >= TASK_SIZE_MAX)

		end = TASK_SIZE_MAX;

	if (end >= DEFAULT_MAP_WINDOW)

		end = DEFAULT_MAP_WINDOW;

	end -= len;



	if (end > start) {

arch/x86/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -991,4 +991,6 @@ enum taa_mitigations { 
	TAA_MITIGATION_TSX_DISABLED,

};



extern bool gds_ucode_mitigated(void);



#endif /* _ASM_X86_PROCESSOR_H */