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

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

Merge 5.4.234 into android11-5.4-lts 



Changes in 5.4.234
	arm64: dts: rockchip: drop unused LED mode property from rk3328-roc-cc
	ARM: dts: rockchip: add power-domains property to dp node on rk3288
	ACPI: NFIT: fix a potential deadlock during NFIT teardown
	btrfs: send: limit number of clones and allocated memory size
	IB/hfi1: Assign npages earlier
	neigh: make sure used and confirmed times are valid
	HID: core: Fix deadloop in hid_apply_multiplier.
	bpf: bpf_fib_lookup should not return neigh in NUD_FAILED state
	net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues().
	vc_screen: don't clobber return value in vcs_read
	dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size
	USB: serial: option: add support for VW/Skoda "Carstick LTE"
	USB: core: Don't hold device lock while reading the "descriptors" sysfs file
	Linux 5.4.234

Change-Id: I6837168681c8976aff33a4de3c1d91a56ba2b708
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6bb176e0 a103859a

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 233

SUBLEVEL = 234

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/rk3288.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ 
		clock-names = "dp", "pclk";

		phys = <&edp_phy>;

		phy-names = "dp";

		power-domains = <&power RK3288_PD_VIO>;

		resets = <&cru SRST_EDP>;

		reset-names = "dp";

		rockchip,grf = <&grf>;

arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

+0 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
			linux,default-trigger = "heartbeat";

			gpios = <&rk805 1 GPIO_ACTIVE_LOW>;

			default-state = "on";

			mode = <0x23>;

		};



		user {
@@ -98,7 +97,6 @@ 
			linux,default-trigger = "mmc1";

			gpios = <&rk805 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

			mode = <0x05>;

		};

	};

};

drivers/acpi/nfit/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3599,8 +3599,8 @@ void acpi_nfit_shutdown(void *data) 


	mutex_lock(&acpi_desc->init_mutex);

	set_bit(ARS_CANCEL, &acpi_desc->scrub_flags);

	cancel_delayed_work_sync(&acpi_desc->dwork);

	mutex_unlock(&acpi_desc->init_mutex);

	cancel_delayed_work_sync(&acpi_desc->dwork);



	/*

	 * Bounce the nvdimm bus lock to make sure any in-flight

drivers/dma/sh/rcar-dmac.c

+4 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,10 @@ static int rcar_dmac_probe(struct platform_device *pdev) 
	dmac->dev = &pdev->dev;

	platform_set_drvdata(pdev, dmac);

	dmac->dev->dma_parms = &dmac->parms;

	dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);

	ret = dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);

	if (ret)

		return ret;



	ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));

	if (ret)

		return ret;