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

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

Merge 5.4.178 into android11-5.4-lts 



Changes in 5.4.178
	audit: improve audit queue handling when "audit=1" on cmdline
	ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()
	ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()
	ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx()
	ALSA: usb-audio: Simplify quirk entries with a macro
	ALSA: hda/realtek: Add quirk for ASUS GU603
	ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks
	ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset)
	ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows
	btrfs: fix deadlock between quota disable and qgroup rescan worker
	drm/nouveau: fix off by one in BIOS boundary checking
	mm/kmemleak: avoid scanning potential huge holes
	block: bio-integrity: Advance seed correctly for larger interval sizes
	Revert "ASoC: mediatek: Check for error clk pointer"
	memcg: charge fs_context and legacy_fs_context
	IB/rdmavt: Validate remote_addr during loopback atomic tests
	RDMA/siw: Fix broken RDMA Read Fence/Resume logic.
	RDMA/mlx4: Don't continue event handler after memory allocation failure
	iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping()
	iommu/amd: Fix loop timeout issue in iommu_ga_log_enable()
	spi: bcm-qspi: check for valid cs before applying chip select
	spi: mediatek: Avoid NULL pointer crash in interrupt
	spi: meson-spicc: add IRQ check in meson_spicc_probe
	net: ieee802154: hwsim: Ensure proper channel selection at probe time
	net: ieee802154: mcr20a: Fix lifs/sifs periods
	net: ieee802154: ca8210: Stop leaking skb's
	net: ieee802154: Return meaningful error codes from the netlink helpers
	net: macsec: Verify that send_sci is on when setting Tx sci explicitly
	net: stmmac: dump gmac4 DMA registers correctly
	net: stmmac: ensure PTP time register reads are consistent
	drm/i915/overlay: Prevent divide by zero bugs in scaling
	ASoC: fsl: Add missing error handling in pcm030_fabric_probe
	ASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytes
	ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name
	ASoC: max9759: fix underflow in speaker_gain_control_put()
	pinctrl: bcm2835: Fix a few error paths
	scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe
	nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client.
	selftests: futex: Use variable MAKE instead of make
	rtc: cmos: Evaluate century appropriate
	EDAC/altera: Fix deferred probing
	EDAC/xgene: Fix deferred probing
	ext4: fix error handling in ext4_restore_inline_data()
	cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning
	Linux 5.4.178

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic5bc9b2941b9932cfd3c98c8af8593196bb15245
parents 92070960 76fd334f

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 177

SUBLEVEL = 178

EXTRAVERSION =

NAME = Kleptomaniac Octopus

block/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ void bio_integrity_advance(struct bio *bio, unsigned int bytes_done) 
	struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);

	unsigned bytes = bio_integrity_bytes(bi, bytes_done >> 9);



	bip->bip_iter.bi_sector += bytes_done >> 9;

	bip->bip_iter.bi_sector += bio_integrity_intervals(bi, bytes_done >> 9);

	bvec_iter_advance(bip->bip_vec, &bip->bip_iter, bytes);

}

drivers/edac/altera_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int altr_sdram_probe(struct platform_device *pdev) 
	if (irq < 0) {

		edac_printk(KERN_ERR, EDAC_MC,

			    "No irq %d in DT\n", irq);

		return -ENODEV;

		return irq;

	}



	/* Arria10 has a 2nd IRQ */

drivers/edac/xgene_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1922,7 +1922,7 @@ static int xgene_edac_probe(struct platform_device *pdev) 
			irq = platform_get_irq(pdev, i);

			if (irq < 0) {

				dev_err(&pdev->dev, "No IRQ resource\n");

				rc = -EINVAL;

				rc = irq;

				goto out_err;

			}

			rc = devm_request_irq(&pdev->dev, irq,

drivers/gpu/drm/i915/display/intel_overlay.c

+3 −0
Original line number Diff line number Diff line
@@ -913,6 +913,9 @@ static int check_overlay_dst(struct intel_overlay *overlay, 
	const struct intel_crtc_state *pipe_config =

		overlay->crtc->config;



	if (rec->dst_height == 0 || rec->dst_width == 0)

		return -EINVAL;



	if (rec->dst_x < pipe_config->pipe_src_w &&

	    rec->dst_x + rec->dst_width <= pipe_config->pipe_src_w &&

	    rec->dst_y < pipe_config->pipe_src_h &&