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

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

Merge 5.4.205 into android11-5.4-lts 



Changes in 5.4.205
	esp: limit skb_page_frag_refill use to a single page
	mm/slub: add missing TID updates on slab deactivation
	can: bcm: use call_rcu() instead of costly synchronize_rcu()
	can: grcan: grcan_probe(): remove extra of_node_get()
	can: gs_usb: gs_usb_open/close(): fix memory leak
	usbnet: fix memory leak in error case
	net: rose: fix UAF bug caused by rose_t0timer_expiry
	iommu/vt-d: Fix PCI bus rescan device hot add
	fbdev: fbmem: Fix logo center image dx issue
	fbmem: Check virtual screen sizes in fb_set_var()
	fbcon: Disallow setting font bigger than screen size
	fbcon: Prevent that screen size is smaller than font size
	video: of_display_timing.h: include errno.h
	powerpc/powernv: delay rng platform device creation until later in boot
	can: kvaser_usb: replace run-time checks with struct kvaser_usb_driver_info
	can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression
	can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits
	xfs: remove incorrect ASSERT in xfs_rename
	ARM: meson: Fix refcount leak in meson_smp_prepare_cpus
	pinctrl: sunxi: a83t: Fix NAND function name for some pins
	pinctrl: sunxi: sunxi_pconf_set: use correct offset
	ARM: at91: pm: use proper compatible for sama5d2's rtc
	ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt
	ibmvnic: Properly dispose of all skbs during a failover.
	selftests: forwarding: fix flood_unicast_test when h2 supports IFF_UNICAST_FLT
	selftests: forwarding: fix learning_test when h1 supports IFF_UNICAST_FLT
	selftests: forwarding: fix error message in learning_test
	i2c: cadence: Unregister the clk notifier in error path
	dmaengine: imx-sdma: Allow imx8m for imx7 FW revs
	misc: rtsx_usb: fix use of dma mapped buffer for usb bulk transfer
	misc: rtsx_usb: use separate command and response buffers
	misc: rtsx_usb: set return value in rsp_buf alloc err path
	dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo
	ida: don't use BUG_ON() for debugging
	dmaengine: pl330: Fix lockdep warning about non-static key
	dmaengine: at_xdma: handle errors of at_xdmac_alloc_desc() correctly
	dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate
	dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
	Linux 5.4.205

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4703f4f796340ab54bf168101d41da2a001419f0
parents 63b83aed 0ec831fa

Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ if: 
then:

  properties:

    clocks:

      maxItems: 2

      minItems: 2



  required:

    - clock-names

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 204

SUBLEVEL = 205

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/mach-at91/pm.c

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static const struct wakeup_source_info ws_info[] = { 


static const struct of_device_id sama5d2_ws_ids[] = {

	{ .compatible = "atmel,sama5d2-gem",		.data = &ws_info[0] },

	{ .compatible = "atmel,at91rm9200-rtc",		.data = &ws_info[1] },

	{ .compatible = "atmel,sama5d2-rtc",		.data = &ws_info[1] },

	{ .compatible = "atmel,sama5d3-udc",		.data = &ws_info[2] },

	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },

	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
@@ -114,12 +114,12 @@ static const struct of_device_id sama5d2_ws_ids[] = { 
};



static const struct of_device_id sam9x60_ws_ids[] = {

	{ .compatible = "atmel,at91sam9x5-rtc",		.data = &ws_info[1] },

	{ .compatible = "microchip,sam9x60-rtc",	.data = &ws_info[1] },

	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },

	{ .compatible = "usb-ohci",			.data = &ws_info[2] },

	{ .compatible = "atmel,at91sam9g45-ehci",	.data = &ws_info[2] },

	{ .compatible = "usb-ehci",			.data = &ws_info[2] },

	{ .compatible = "atmel,at91sam9260-rtt",	.data = &ws_info[4] },

	{ .compatible = "microchip,sam9x60-rtt",	.data = &ws_info[4] },

	{ .compatible = "cdns,sam9x60-macb",		.data = &ws_info[5] },

	{ /* sentinel */ }

};

arch/arm/mach-meson/platsmp.c

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, 
	}



	sram_base = of_iomap(node, 0);

	of_node_put(node);

	if (!sram_base) {

		pr_err("Couldn't map SRAM registers\n");

		return;
@@ -91,6 +92,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, 
	}



	scu_base = of_iomap(node, 0);

	of_node_put(node);

	if (!scu_base) {

		pr_err("Couldn't map SCU registers\n");

		return;

arch/powerpc/platforms/powernv/rng.c

+10 −6
Original line number Diff line number Diff line
@@ -176,12 +176,8 @@ static int __init pnv_get_random_long_early(unsigned long *v) 
		    NULL) != pnv_get_random_long_early)

		return 0;



	for_each_compatible_node(dn, NULL, "ibm,power-rng") {

		if (rng_create(dn))

			continue;

		/* Create devices for hwrng driver */

		of_platform_device_create(dn, NULL, NULL);

	}

	for_each_compatible_node(dn, NULL, "ibm,power-rng")

		rng_create(dn);



	if (!ppc_md.get_random_seed)

		return 0;
@@ -205,10 +201,18 @@ void __init pnv_rng_init(void) 


static int __init pnv_rng_late_init(void)

{

	struct device_node *dn;

	unsigned long v;



	/* In case it wasn't called during init for some other reason. */

	if (ppc_md.get_random_seed == pnv_get_random_long_early)

		pnv_get_random_long_early(&v);



	if (ppc_md.get_random_seed == powernv_get_random_long) {

		for_each_compatible_node(dn, NULL, "ibm,power-rng")

			of_platform_device_create(dn, NULL, NULL);

	}



	return 0;

}

machine_subsys_initcall(powernv, pnv_rng_late_init);