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

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

Merge 5.4.17 into android-5.4 



Changes in 5.4.17
	Bluetooth: btusb: fix non-atomic allocation in completion handler
	orinoco_usb: fix interface sanity check
	rsi_91x_usb: fix interface sanity check
	usb: dwc3: pci: add ID for the Intel Comet Lake -V variant
	usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186
	USB: serial: ir-usb: add missing endpoint sanity check
	USB: serial: ir-usb: fix link-speed handling
	USB: serial: ir-usb: fix IrLAP framing
	usb: dwc3: turn off VBUS when leaving host mode
	usb: typec: wcove: fix "op-sink-microwatt" default that was in mW
	usb: typec: fusb302: fix "op-sink-microwatt" default that was in mW
	staging: most: net: fix buffer overflow
	staging: wlan-ng: ensure error return is actually returned
	staging: vt6656: correct packet types for CTS protect, mode.
	staging: vt6656: use NULLFUCTION stack on mac80211
	staging: vt6656: Fix false Tx excessive retries reporting.
	serial: 8250_bcm2835aux: Fix line mismatch on driver unbind
	serial: imx: fix a race condition in receive path
	debugfs: Return -EPERM when locked down
	component: do not dereference opaque pointer in debugfs
	binder: fix log spam for existing debugfs file creation.
	mei: hdcp: bind only with i915 on the same PCH
	mei: me: add comet point (lake) H device ids
	iio: adc: stm32-dfsdm: fix single conversion
	iio: st_gyro: Correct data for LSM9DS0 gyro
	driver core: Fix test_async_driver_probe if NUMA is disabled
	crypto: chelsio - fix writing tfm flags to wrong place
	CIFS: Fix task struct use-after-free on reconnect
	cifs: set correct max-buffer-size for smb2_ioctl_init()
	cifs: Fix memory allocation in __smb2_handle_cancelled_cmd()
	ath9k: fix storage endpoint lookup
	brcmfmac: fix interface sanity check
	rtl8xxxu: fix interface sanity check
	zd1211rw: fix storage endpoint lookup
	net_sched: ematch: reject invalid TCF_EM_SIMPLE
	net_sched: fix ops->bind_class() implementations
	net_sched: walk through all child classes in tc_bind_tclass()
	net: socionext: fix possible user-after-free in netsec_process_rx
	net: socionext: fix xdp_result initialization in netsec_process_rx
	udp: segment looped gso packets correctly
	mlxsw: minimal: Fix an error handling path in 'mlxsw_m_port_create()'
	net: include struct nhmsg size in nh nlmsg size
	rxrpc: Fix use-after-free in rxrpc_receive_data()
	HID: multitouch: Add LG MELF0410 I2C touchscreen support
	arc: eznps: fix allmodconfig kconfig warning
	HID: Add quirk for Xin-Mo Dual Controller
	HID: ite: Add USB id match for Acer SW5-012 keyboard dock
	HID: asus: Ignore Asus vendor-page usage-code 0xff events
	HID: Add quirk for incorrect input length on Lenovo Y720
	HID: intel-ish-hid: ipc: add CMP device id
	HID: wacom: Recognize new MobileStudio Pro PID
	ASoC: SOF: fix fault at driver unload after failed probe
	ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free
	drivers/hid/hid-multitouch.c: fix a possible null pointer access.
	phy: qcom-qmp: Increase PHY ready timeout
	ASoC: fsl_audmix: add missed pm_runtime_disable
	ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime()
	phy: cpcap-usb: Prevent USB line glitches from waking up modem
	HID: intel-ish-hid: ipc: Add Tiger Lake PCI device ID
	watchdog: max77620_wdt: fix potential build errors
	watchdog: rn5t618_wdt: fix module aliases
	watchdog: orion: fix platform_get_irq() complaints
	usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
	can: tcan4x5x: tcan4x5x_parse_config(): reset device before register access
	spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent calls
	net: Google gve: Remove dma_wmb() before ringing doorbell
	drivers/net/b44: Change to non-atomic bit operations on pwol_mask
	net: wan: sdla: Fix cast from pointer to integer of different size
	gpio: max77620: Add missing dependency on GPIOLIB_IRQCHIP
	iommu/dma: fix variable 'cookie' set but not used
	drm/amd/display: Reduce HDMI pixel encoding if max clock is exceeded
	stmmac: debugfs entry name is not be changed when udev rename device name.
	atm: eni: fix uninitialized variable warning
	HID: steam: Fix input device disappearing
	extcon-intel-cht-wc: Don't reset USB data connection at probe
	ASoC: Intel: cht_bsw_rt5645: Add quirk for boards using pmc_plt_clk_0
	drm/amdgpu/SRIOV: add navi12 pci id for SRIOV (v2)
	libbpf: Fix BTF-defined map's __type macro handling of arrays
	staging: mt7621-pci: add quirks for 'E2' revision using 'soc_device_attribute'
	platform/x86: dell-laptop: disable kbd backlight on Inspiron 10xx
	PCI: Add DMA alias quirk for Intel VCA NTB
	media: dvbsky: add support for eyeTV Geniatech T2 lite
	bus: ti-sysc: Handle mstandby quirk and use it for musb
	bus: ti-sysc: Use swsup quirks also for am335x musb
	spi: pxa2xx: Add support for Intel Comet Lake-H
	iommu/amd: Support multiple PCI DMA aliases in device table
	iommu/amd: Support multiple PCI DMA aliases in IRQ Remapping
	perf/imx_ddr: Add enhanced AXI ID filter support
	mfd: intel-lpss: Add Intel Comet Lake PCH-H PCI IDs
	ARM: config: aspeed-g5: Enable 8250_DW quirks
	ARM: OMAP2+: SmartReflex: add omap_sr_pdata definition
	mmc: sdhci-pci: Quirk for AMD SDHC Device 0x7906
	mmc: sdhci-pci: Add support for Intel JSL
	bus: ti-sysc: Add module enable quirk for audio AESS
	usb-storage: Disable UAS on JMicron SATA enclosure
	ALSA: hda/realtek - Move some alc236 pintbls to fallback table
	Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks
	Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk
	bus: ti-sysc: Fix missing force mstandby quirk handling
	rsi: fix use-after-free on failed probe and unbind
	rsi: fix use-after-free on probe errors
	rsi: fix memory leak on failed URB submission
	rsi: fix non-atomic allocation in completion handler
	crypto: af_alg - Use bh_lock_sock in sk_destruct
	crypto: vmx - reject xts inputs that are too short
	crypto: caam - do not reset pointer size from MCFGR register
	crypto: pcrypt - Fix user-after-free on module unload
	KVM: arm64: Write arch.mdcr_el2 changes since last vcpu_load on VHE
	Revert "um: Enable CONFIG_CONSTRUCTORS"
	power/supply: ingenic-battery: Don't change scale if there's only one
	Linux 5.4.17

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I03dc4a2a426ff7700c26560c294bcbfc66f26e38
parents 4a192aa5 313c8460

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 16

SUBLEVEL = 17

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arc/plat-eznps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
menuconfig ARC_PLAT_EZNPS

	bool "\"EZchip\" ARC dev platform"

	select CPU_BIG_ENDIAN

	select CLKSRC_NPS

	select CLKSRC_NPS if !PHYS_ADDR_T_64BIT

	select EZNPS_GIC

	select EZCHIP_NPS_MANAGEMENT_ENET if ETHERNET

	help

arch/arm/configs/aspeed_g5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6 
CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_ASPEED_VUART=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_ASPEED_KCS_IPMI_BMC=y

CONFIG_ASPEED_BT_IPMI_BMC=y

arch/arm64/kvm/debug.c

+5 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) 
void kvm_arm_setup_debug(struct kvm_vcpu *vcpu)

{

	bool trap_debug = !(vcpu->arch.flags & KVM_ARM64_DEBUG_DIRTY);

	unsigned long mdscr;

	unsigned long mdscr, orig_mdcr_el2 = vcpu->arch.mdcr_el2;



	trace_kvm_arm_setup_debug(vcpu, vcpu->guest_debug);
@@ -197,6 +197,10 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) 
	if (vcpu_read_sys_reg(vcpu, MDSCR_EL1) & (DBG_MDSCR_KDE | DBG_MDSCR_MDE))

		vcpu->arch.flags |= KVM_ARM64_DEBUG_DIRTY;



	/* Write mdcr_el2 changes since vcpu_load on VHE systems */

	if (has_vhe() && orig_mdcr_el2 != vcpu->arch.mdcr_el2)

		write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2);



	trace_kvm_arm_set_dreg32("MDCR_EL2", vcpu->arch.mdcr_el2);

	trace_kvm_arm_set_dreg32("MDSCR_EL1", vcpu_read_sys_reg(vcpu, MDSCR_EL1));

}

arch/um/include/asm/common.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ 
	__preinit_array_end = .;

  }

  .init_array : {

        /* dummy - we call this ourselves */

	__init_array_start = .;

	*(.init_array)

	__init_array_end = .;

  }

  .fini_array : {