Commit 27e81469 authored Mar 11, 2022 by Greg Kroah-Hartman

Merge 4.19.233 into android-4.19-stable



Changes in 4.19.233
	mac80211_hwsim: report NOACK frames in tx_status
	mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
	i2c: bcm2835: Avoid clock stretching timeouts
	ASoC: rt5668: do not block workqueue if card is unbound
	ASoC: rt5682: do not block workqueue if card is unbound
	Input: clear BTN_RIGHT/MIDDLE on buttonpads
	cifs: fix double free race when mount fails in cifs_get_root()
	dmaengine: shdma: Fix runtime PM imbalance on error
	i2c: cadence: allow COMPILE_TEST
	i2c: qup: allow COMPILE_TEST
	net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990
	usb: gadget: don't release an existing dev->buf
	usb: gadget: clear related members when goto fail
	ata: pata_hpt37x: fix PCI clock detection
	ALSA: intel_hdmi: Fix reference to PCM buffer address
	ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min
	xfrm: fix MTU regression
	netfilter: fix use-after-free in __nf_register_net_hook()
	xfrm: fix the if_id check in changelink
	xfrm: enforce validity of offload input flags
	netfilter: nf_queue: don't assume sk is full socket
	netfilter: nf_queue: fix possible use-after-free
	batman-adv: Request iflink once in batadv-on-batadv check
	batman-adv: Request iflink once in batadv_get_real_netdevice
	batman-adv: Don't expect inter-netns unique iflink indices
	net: dcb: flush lingering app table entries for unregistered devices
	net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client
	net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server
	block: Fix fsync always failed if once failed
	PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
	xen/netfront: destroy queues before real_num_tx_queues is zeroed
	mac80211: fix forwarded mesh frames AC & queue selection
	net: stmmac: fix return value of __setup handler
	net: sxgbe: fix return value of __setup handler
	net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()
	efivars: Respect "block" flag in efivar_entry_set_safe()
	firmware: arm_scmi: Remove space in MODULE_ALIAS name
	can: gs_usb: change active_channels's type from atomic_t to u8
	arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output
	ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions
	ibmvnic: free reset-work-item when flushing
	soc: fsl: qe: Check of ioremap return value
	net: chelsio: cxgb3: check the return value of pci_find_capability()
	nl80211: Handle nla_memdup failures in handle_nan_filter
	Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
	Input: elan_i2c - fix regulator enable count imbalance after suspend/resume
	HID: add mapping for KEY_ALL_APPLICATIONS
	memfd: fix F_SEAL_WRITE after shmem huge page allocated
	tracing/histogram: Fix sorting on old "cpu" value
	btrfs: add missing run of delayed items after unlink during log replay
	net: dcb: disable softirqs in dcbnl_flush_dev()
	hamradio: fix macro redefine warning
	Linux 4.19.233

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

parents b95666a1 c2ea1658

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 232
		SUBLEVEL = 233
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm/mm/mmu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -230,12 +230,14 @@ early_param("ecc", early_ecc);
		static int __init early_cachepolicy(char *p)
		{
		pr_warn("cachepolicy kernel parameter not supported without cp15\n");
		return 0;
		}
		early_param("cachepolicy", early_cachepolicy);

		static int __init noalign_setup(char *__unused)
		{
		pr_warn("noalign kernel parameter not supported without cp15\n");
		return 1;
		}
		__setup("noalign", noalign_setup);

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

+12 −5

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

		sound: sound {
		compatible = "rockchip,rk3399-gru-sound";
		rockchip,cpu = <&i2s0 &i2s2>;
		rockchip,cpu = <&i2s0 &spdif>;
		};
		};

		@@ -438,10 +438,6 @@ ap_i2c_audio: &i2c8 {
		status = "okay";
		};

		&i2s2 {
		status = "okay";
		};

		&io_domains {
		status = "okay";

		@@ -538,6 +534,17 @@ ap_i2c_audio: &i2c8 {
		vqmmc-supply = <&ppvar_sd_card_io>;
		};

		&spdif {
		status = "okay";

		/*
		* SPDIF is routed internally to DP; we either don't use these pins, or
		* mux them to something else.
		*/
		/delete-property/ pinctrl-0;
		/delete-property/ pinctrl-names;
		};

		&spi1 {
		status = "okay";

block/blk-flush.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -239,8 +239,10 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
		return;
		}

		if (fq->rq_status != BLK_STS_OK)
		if (fq->rq_status != BLK_STS_OK) {
		error = fq->rq_status;
		fq->rq_status = BLK_STS_OK;
		}

		hctx = blk_mq_map_queue(q, flush_rq->mq_ctx->cpu);
		if (!q->elevator) {

drivers/ata/pata_hpt37x.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -961,14 +961,14 @@ static int hpt37x_init_one(struct pci_dev dev, const struct pci_device_id id)

		if ((freq >> 12) != 0xABCDE) {
		int i;
		u8 sr;
		u16 sr;
		u32 total = 0;

		pr_warn("BIOS has not set timing clocks\n");

		/* This is the process the HPT371 BIOS is reported to use */
		for (i = 0; i < 128; i++) {
		pci_read_config_byte(dev, 0x78, &sr);
		pci_read_config_word(dev, 0x78, &sr);
		total += sr & 0x1FF;
		udelay(15);
		}