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

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

Merge 4.19.222 into android-4.19-stable 



Changes in 4.19.222
	stable: clamp SUBLEVEL in 4.19
	nfc: fix segfault in nfc_genl_dump_devices_done
	drm/msm/dsi: set default num_data_lanes
	net/mlx4_en: Update reported link modes for 1/10G
	parisc/agp: Annotate parisc agp init functions with __init
	i2c: rk3x: Handle a spurious start completion interrupt flag
	net: netlink: af_netlink: Prevent empty skb by adding a check on len.
	tracing: Fix a kmemleak false positive in tracing_map
	hwmon: (dell-smm) Fix warning on /proc/i8k creation error
	mac80211: send ADDBA requests using the tid/queue of the aggregation session
	recordmcount.pl: look for jgnop instruction as well as bcrl on s390
	dm btree remove: fix use after free in rebalance_children()
	audit: improve robustness of the audit queue handling
	nfsd: fix use-after-free due to delegation race
	x86: Make ARCH_USE_MEMREMAP_PROT a generic Kconfig symbol
	x86/sme: Explicitly map new EFI memmap table as encrypted
	mac80211: track only QoS data frames for admission control
	ARM: socfpga: dts: fix qspi node compatible
	sch_cake: do not call cake_destroy() from cake_init()
	dmaengine: st_fdma: fix MODULE_ALIAS
	rds: memory leak in __rds_conn_create()
	soc/tegra: fuse: Fix bitwise vs. logical OR warning
	igb: Fix removal of unicast MAC filters of VFs
	igbvf: fix double free in `igbvf_probe`
	ixgbe: set X550 MDIO speed before talking to PHY
	netdevsim: Zero-initialize memory for new map's value in function nsim_bpf_map_alloc
	net/packet: rx_owner_map depends on pg_vec
	sit: do not call ipip6_dev_free() from sit_init_net()
	USB: gadget: bRequestType is a bitfield, not a enum
	USB: NO_LPM quirk Lenovo USB-C to Ethernet Adapher(RTL8153-04)
	PCI/MSI: Clear PCI_MSIX_FLAGS_MASKALL on error
	PCI/MSI: Mask MSI-X vectors only on success
	USB: serial: cp210x: fix CP2105 GPIO registration
	USB: serial: option: add Telit FN990 compositions
	timekeeping: Really make sure wall_to_monotonic isn't positive
	libata: if T_LENGTH is zero, dma direction should be DMA_NONE
	drm/amdgpu: correct register access for RLC_JUMP_TABLE_RESTORE
	net: systemport: Add global locking for descriptor lifecycle
	mac80211: validate extended element ID is present
	net: lan78xx: Avoid unnecessary self assignment
	ARM: 8805/2: remove unneeded naked function usage
	mwifiex: Remove unnecessary braces from HostCmd_SET_SEQ_NO_BSS_INFO
	ARM: 8800/1: use choice for kernel unwinders
	Input: touchscreen - avoid bitwise vs logical OR warning
	firmware: arm_scpi: Fix string overflow in SCPI genpd driver
	ARM: dts: imx6ull-pinfunc: Fix CSI_DATA07__ESAI_TX0 pad name
	media: mxl111sf: change mutex_init() location
	fuse: annotate lock in fuse_reverse_inval_entry()
	ovl: fix warning in ovl_create_real()
	scsi: scsi_debug: Sanity check block descriptor length in resp_mode_select()
	xen/blkfront: harden blkfront against event channel storms
	xen/netfront: harden netfront against event channel storms
	xen/console: harden hvc_xen against event channel storms
	xen/netback: fix rx queue stall detection
	xen/netback: don't queue unlimited number of packages
	Linux 4.19.222

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I2cbae15209a73e612b3acded2e87cacf48024186
parents 2919239c 508a321e

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 221

SUBLEVEL = 222

EXTRAVERSION =

NAME = "People's Front"
@@ -1264,7 +1264,7 @@ endef 


define filechk_version.h

	(echo \#define LINUX_VERSION_CODE $(shell                         \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

endef

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -982,6 +982,9 @@ config HAVE_ARCH_PREL32_RELOCATIONS 
	  architectures, and don't require runtime relocation on relocatable

	  kernels.



config ARCH_USE_MEMREMAP_PROT

	bool



# Select if the architecture has support for applying RELR relocations.

config ARCH_HAS_RELR

	bool

arch/arm/Kconfig.debug

+28 −16
Original line number Diff line number Diff line
@@ -45,30 +45,42 @@ config DEBUG_WX 


		If in doubt, say "Y".



# RMK wants arm kernels compiled with frame pointers or stack unwinding.

# If you know what you are doing and are willing to live without stack

# traces, you can get a slightly smaller kernel by setting this option to

# n, but then RMK will have to kill you ;).

config FRAME_POINTER

	bool

	depends on !THUMB2_KERNEL

	default y if !ARM_UNWIND || FUNCTION_GRAPH_TRACER

choice

	prompt "Choose kernel unwinder"

	default UNWINDER_ARM if AEABI && !FUNCTION_GRAPH_TRACER

	default UNWINDER_FRAME_POINTER if !AEABI || FUNCTION_GRAPH_TRACER

	help

	  If you say N here, the resulting kernel will be slightly smaller and

	  faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,

	  when a problem occurs with the kernel, the information that is

	  reported is severely limited.

	  This determines which method will be used for unwinding kernel stack

	  traces for panics, oopses, bugs, warnings, perf, /proc/<pid>/stack,

	  livepatch, lockdep, and more.



config ARM_UNWIND

	bool "Enable stack unwinding support (EXPERIMENTAL)"

config UNWINDER_FRAME_POINTER

	bool "Frame pointer unwinder"

	depends on !THUMB2_KERNEL && !CC_IS_CLANG

	select ARCH_WANT_FRAME_POINTERS

	select FRAME_POINTER

	help

	  This option enables the frame pointer unwinder for unwinding

	  kernel stack traces.



config UNWINDER_ARM

	bool "ARM EABI stack unwinder"

	depends on AEABI

	default y

	select ARM_UNWIND

	help

	  This option enables stack unwinding support in the kernel

	  using the information automatically generated by the

	  compiler. The resulting kernel image is slightly bigger but

	  the performance is not affected. Currently, this feature

	  only works with EABI compilers. If unsure say Y.

	  only works with EABI compilers.



endchoice



config ARM_UNWIND

	bool



config FRAME_POINTER

	bool



config OLD_MCOUNT

	bool

arch/arm/boot/dts/imx6ull-pinfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -68,6 +68,6 @@ 
#define MX6ULL_PAD_CSI_DATA04__ESAI_TX_FS                         0x01F4 0x0480 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA05__ESAI_TX_CLK                        0x01F8 0x0484 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA06__ESAI_TX5_RX0                       0x01FC 0x0488 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA07__ESAI_T0                            0x0200 0x048C 0x0000 0x9 0x0

#define MX6ULL_PAD_CSI_DATA07__ESAI_TX0                           0x0200 0x048C 0x0000 0x9 0x0



#endif /* __DTS_IMX6ULL_PINFUNC_H */

arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
	flash0: n25q00@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q00aa";

		compatible = "micron,mt25qu02g", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <100000000>;