Commit 0cf7a2be authored May 25, 2022 by Greg Kroah-Hartman

Merge 5.4.196 into android11-5.4-lts



Changes in 5.4.196
	floppy: use a statically allocated error counter
	x86/xen: Make the boot CPU idle task reliable
	x86/xen: Make the secondary CPU idle tasks reliable
	rtc: fix use-after-free on device removal
	um: Cleanup syscall_handler_t definition/cast, fix warning
	Input: add bounds checking to input_set_capability()
	Input: stmfts - fix reference leak in stmfts_input_open
	crypto: stm32 - fix reference leak in stm32_crc_remove
	crypto: x86/chacha20 - Avoid spurious jumps to other functions
	ALSA: hda/realtek: Enable headset mic on Lenovo P360
	nvme-multipath: fix hang when disk goes live over reconnect
	rtc: mc146818-lib: Fix the AltCentury for AMD platforms
	MIPS: lantiq: check the return value of kzalloc()
	drbd: remove usage of list iterator variable after loop
	platform/chrome: cros_ec_debugfs: detach log reader wq from devm
	ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
	nilfs2: fix lockdep warnings in page operations for btree nodes
	nilfs2: fix lockdep warnings during disk space reclamation
	mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC
	mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD
	mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()
	SUNRPC: Clean up scheduling of autoclose
	SUNRPC: Prevent immediate close+reconnect
	SUNRPC: Don't call connect() more than once on a TCP socket
	SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()
	ALSA: wavefront: Proper check of get_user() error
	perf: Fix sys_perf_event_open() race against self
	Fix double fget() in vhost_net_set_backend()
	PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold
	KVM: x86/mmu: Update number of zapped pages even if page list is stable
	crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ
	drm/dp/mst: fix a possible memory leak in fetch_monitor_name()
	dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace
	ARM: dts: aspeed-g6: remove FWQSPID group in pinctrl dtsi
	ARM: dts: aspeed-g6: fix SPI1/SPI2 quad pin group
	net: macb: Increment rx bd head after allocating skb and buffer
	net/sched: act_pedit: sanitize shift argument before usage
	net: vmxnet3: fix possible use-after-free bugs in vmxnet3_rq_alloc_rx_buf()
	net: vmxnet3: fix possible NULL pointer dereference in vmxnet3_rq_cleanup()
	ice: fix possible under reporting of ethtool Tx and Rx statistics
	clk: at91: generated: consider range when calculating best rate
	net/qla3xxx: Fix a test in ql_reset_work()
	NFC: nci: fix sleep in atomic context bugs caused by nci_skb_alloc
	net/mlx5e: Properly block LRO when XDP is enabled
	net: af_key: add check for pfkey_broadcast in function pfkey_process
	ARM: 9196/1: spectre-bhb: enable for Cortex-A15
	ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
	igb: skip phy status check where unavailable
	net: bridge: Clear offload_fwd_mark when passing frame up bridge interface.
	gpio: gpio-vf610: do not touch other bits when set the target bit
	gpio: mvebu/pwm: Refuse requests with inverted polarity
	perf bench numa: Address compiler error on s390
	scsi: qla2xxx: Fix missed DMA unmap for aborted commands
	mac80211: fix rx reordering with non explicit / psmp ack policy
	selftests: add ping test with ping_group_range tuned
	ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one()
	net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
	net: atlantic: verify hw_head_ lies within TX buffer ring
	Input: ili210x - fix reset timing
	block: return ELEVATOR_DISCARD_MERGE if possible
	net: stmmac: disable Split Header (SPH) for Intel platforms
	firmware_loader: use kernel credentials when reading firmware
	ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk
	Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
	x86/xen: fix booting 32-bit pv guest
	x86/xen: Mark cpu_bringup_and_idle() as dead_end_function
	i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
	afs: Fix afs_getattr() to refetch file status if callback break occurred
	Linux 5.4.196

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8464b114a6d5d655386f3c794bbb8bbc3a94e0ec

parents abcfb6ab 04b092e4

Documentation/DMA-attributes.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -156,13 +156,3 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged
		subsystem that the buffer is fully accessible at the elevated privilege
		level (and ideally inaccessible or at least read-only at the
		lesser-privileged levels).

		DMA_ATTR_PRIVILEGED
		-------------------

		Some advanced peripherals such as remote processors and GPUs perform
		accesses to DMA buffers in both privileged "supervisor" and unprivileged
		"user" modes. This attribute is used to indicate to the DMA-mapping
		subsystem that the buffer is fully accessible at the elevated privilege
		level (and ideally inaccessible or at least read-only at the
		lesser-privileged levels).

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 195
		SUBLEVEL = 196
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi

+2 −7

Original line number	Diff line number	Diff line
		@@ -117,11 +117,6 @@
		groups = "FWSPID";
		};

		pinctrl_fwqspid_default: fwqspid_default {
		function = "FWSPID";
		groups = "FWQSPID";
		};

		pinctrl_fwspiwp_default: fwspiwp_default {
		function = "FWSPIWP";
		groups = "FWSPIWP";
		@@ -653,12 +648,12 @@
		};

		pinctrl_qspi1_default: qspi1_default {
		function = "QSPI1";
		function = "SPI1";
		groups = "QSPI1";
		};

		pinctrl_qspi2_default: qspi2_default {
		function = "QSPI2";
		function = "SPI2";
		groups = "QSPI2";
		};

arch/arm/boot/dts/imx7-colibri.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@

		dailink_master: simple-audio-card,codec {
		sound-dai = <&codec>;
		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
		};
		};
		};
		@@ -152,7 +152,7 @@
		compatible = "fsl,sgtl5000";
		#sound-dai-cells = <0>;
		reg = <0x0a>;
		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_sai1_mclk>;
		VDDA-supply = <&reg_module_3v3_avdd>;

arch/arm/boot/dts/imx7-mba7.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@
		tlv320aic32x4: audio-codec@18 {
		compatible = "ti,tlv320aic32x4";
		reg = <0x18>;
		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
		clock-names = "mclk";
		ldoin-supply = <&reg_audio_3v3>;
		iov-supply = <&reg_audio_3v3>;