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

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

Merge 5.4.202 into android11-5.4-lts 



Changes in 5.4.202
	vt: drop old FONT ioctls
	random: schedule mix_interrupt_randomness() less often
	ALSA: hda/via: Fix missing beep setup
	ALSA: hda/conexant: Fix missing beep setup
	ALSA: hda/realtek - ALC897 headset MIC no sound
	ALSA: hda/realtek: Add quirk for Clevo PD70PNT
	net: openvswitch: fix parsing of nw_proto for IPv6 fragments
	mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing
	mtd: rawnand: gpmi: Fix setting busy timeout setting
	ata: libata: add qc->flags in ata_qc_complete_template tracepoint
	dm era: commit metadata in postsuspend after worker stops
	dm mirror log: clear log bits up to BITS_PER_LONG boundary
	random: quiet urandom warning ratelimit suppression message
	USB: serial: option: add Telit LE910Cx 0x1250 composition
	USB: serial: option: add Quectel EM05-G modem
	USB: serial: option: add Quectel RM500K module support
	bpf: Fix request_sock leak in sk lookup helpers
	phy: aquantia: Fix AN when higher speeds than 1G are not advertised
	bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers
	net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms
	drm/msm/mdp4: Fix refcount leak in mdp4_modeset_init_intf
	erspan: do not assume transport header is always set
	net/tls: fix tls_sk_proto_close executed repeatedly
	udmabuf: add back sanity check
	x86/xen: Remove undefined behavior in setup_features()
	MIPS: Remove repetitive increase irq_err_count
	afs: Fix dynamic root getattr
	ice: ethtool: advertise 1000M speeds properly
	regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips
	igb: Make DMA faster when CPU is active on the PCIe link
	virtio_net: fix xdp_rxq_info bug after suspend/resume
	Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
	gpio: winbond: Fix error code in winbond_gpio_get()
	s390/cpumf: Handle events cycles and instructions identical
	iio: adc: vf610: fix conversion mode sysfs node name
	xhci: turn off port power in shutdown
	usb: chipidea: udc: check request status before setting device address
	iio:chemical:ccs811: rearrange iio trigger get and register
	iio:accel:bma180: rearrange iio trigger get and register
	iio:accel:mxc4005: rearrange iio trigger get and register
	iio: accel: mma8452: ignore the return value of reset operation
	iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up()
	iio: trigger: sysfs: fix use-after-free on remove
	iio: adc: stm32: fix maximum clock rate for stm32mp15x
	iio: adc: axp288: Override TS pin bias current for some models
	xtensa: xtfpga: Fix refcount leak bug in setup
	xtensa: Fix refcount leak bug in time.c
	parisc: Enable ARCH_HAS_STRICT_MODULE_RWX
	powerpc: Enable execve syscall exit tracepoint
	powerpc/rtas: Allow ibm,platform-dump RTAS call with null buffer address
	powerpc/powernv: wire up rng during setup_arch
	ARM: dts: imx6qdl: correct PU regulator ramp delay
	ARM: exynos: Fix refcount leak in exynos_map_pmu
	soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe
	ARM: Fix refcount leak in axxia_boot_secondary
	ARM: cns3xxx: Fix refcount leak in cns3xxx_init
	modpost: fix section mismatch check for exported init/exit sections
	random: update comment from copy_to_user() -> copy_to_iter()
	kbuild: link vmlinux only once for CONFIG_TRIM_UNUSED_KSYMS (2nd attempt)
	powerpc/pseries: wire up rng during setup_arch()
	Linux 5.4.202

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ide925d318c8d1f6c3ba72df07c40105a9e5913d5
parents d7a5d91f 9ef3ad40

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode

What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 201

SUBLEVEL = 202

EXTRAVERSION =

NAME = Kleptomaniac Octopus
@@ -1146,7 +1146,7 @@ PHONY += autoksyms_recursive 
ifdef CONFIG_TRIM_UNUSED_KSYMS

autoksyms_recursive: descend modules.order

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \

	  "$(MAKE) -f $(srctree)/Makefile vmlinux"

	  "$(MAKE) -f $(srctree)/Makefile autoksyms_recursive"

endif



# For the kernel to actually contain only the needed exported symbols,

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ 
					regulator-name = "vddpu";

					regulator-min-microvolt = <725000>;

					regulator-max-microvolt = <1450000>;

					regulator-enable-ramp-delay = <150>;

					regulator-enable-ramp-delay = <380>;

					anatop-reg-offset = <0x140>;

					anatop-vol-bit-shift = <9>;

					anatop-vol-bit-width = <5>;

arch/arm/mach-axxia/platsmp.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static int axxia_boot_secondary(unsigned int cpu, struct task_struct *idle) 
		return -ENOENT;



	syscon = of_iomap(syscon_np, 0);

	of_node_put(syscon_np);

	if (!syscon)

		return -ENOMEM;

arch/arm/mach-cns3xxx/core.c

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ static void __init cns3xxx_init(void) 
		/* De-Asscer SATA Reset */

		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SATA));

	}

	of_node_put(dn);



	dn = of_find_compatible_node(NULL, NULL, "cavium,cns3420-sdhci");

	if (of_device_is_available(dn)) {
@@ -389,6 +390,7 @@ static void __init cns3xxx_init(void) 
		cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO));

		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SDIO));

	}

	of_node_put(dn);



	pm_power_off = cns3xxx_power_off;