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

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

Merge 4.19.275 into android-4.19-stable 



Changes in 4.19.275
	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
	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 4.19.275

Change-Id: I46680132c9d3ea01589735e73e344041a513d487
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ef8b9b38 5504146b

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 274

SUBLEVEL = 275

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/rk3288.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,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>;

drivers/acpi/nfit/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3442,8 +3442,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
@@ -1816,7 +1816,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;

drivers/infiniband/hw/hfi1/user_exp_rcv.c

+2 −7
Original line number Diff line number Diff line
@@ -215,16 +215,11 @@ static void unpin_rcv_pages(struct hfi1_filedata *fd, 
static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf)

{

	int pinned;

	unsigned int npages;

	unsigned int npages = tidbuf->npages;

	unsigned long vaddr = tidbuf->vaddr;

	struct page **pages = NULL;

	struct hfi1_devdata *dd = fd->uctxt->dd;



	/* Get the number of pages the user buffer spans */

	npages = num_user_pages(vaddr, tidbuf->length);

	if (!npages)

		return -EINVAL;



	if (npages > fd->uctxt->expected_count) {

		dd_dev_err(dd, "Expected buffer too big\n");

		return -EINVAL;
@@ -258,7 +253,6 @@ static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf) 
		return pinned;

	}

	tidbuf->pages = pages;

	tidbuf->npages = npages;

	fd->tid_n_pinned += pinned;

	return pinned;

}
@@ -334,6 +328,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, 


	tidbuf->vaddr = tinfo->vaddr;

	tidbuf->length = tinfo->length;

	tidbuf->npages = num_user_pages(tidbuf->vaddr, tidbuf->length);

	tidbuf->psets = kcalloc(uctxt->expected_count, sizeof(*tidbuf->psets),

				GFP_KERNEL);

	if (!tidbuf->psets) {