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

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

Merge 4.19.22 into android-4.19 



Changes in 4.19.22
	mtd: Make sure mtd->erasesize is valid even if the partition is of size 0
	mtd: spinand: Handle the case where PROGRAM LOAD does not reset the cache
	mtd: spinand: Fix the error/cleanup path in spinand_init()
	mtd: rawnand: gpmi: fix MX28 bus master lockup problem
	libata: Add NOLPM quirk for SAMSUNG MZ7TE512HMHP-000L1 SSD
	tools: iio: iio_generic_buffer: make num_loops signed
	iio: adc: axp288: Fix TS-pin handling
	iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
	iio: ti-ads8688: Update buffer allocation for timestamps
	signal: Always notice exiting tasks
	signal: Better detection of synchronous signals
	misc: vexpress: Off by one in vexpress_syscfg_exec()
	mei: me: add ice lake point device id.
	samples: mei: use /dev/mei0 instead of /dev/mei
	debugfs: fix debugfs_rename parameter checking
	pinctrl: sunxi: Correct number of IRQ banks on H6 main pin controller
	pinctrl: cherryview: fix Strago DMI workaround
	tracing: uprobes: Fix typo in pr_fmt string
	mips: cm: reprime error cause
	MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
	MIPS: VDSO: Use same -m%-float cflag as the kernel proper
	mips: loongson64: remove unreachable(), fix loongson_poweroff().
	MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
	ARM: iop32x/n2100: fix PCI IRQ mapping
	ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
	ARM: dts: da850: fix interrupt numbers for clocksource
	firmware: arm_scmi: provide the mandatory device release callback
	powerpc/radix: Fix kernel crash with mremap()
	mic: vop: Fix use-after-free on remove
	mac80211: ensure that mgmt tx skbs have tailroom for encryption
	drm/modes: Prevent division by zero htotal
	drm/amd/powerplay: Fix missing break in switch
	drm/i915: always return something on DDI clock selection
	drm/vmwgfx: Fix setting of dma masks
	drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user
	SUNRPC: Always drop the XPRT_LOCK on XPRT_CLOSE_WAIT
	xfrm: Make set-mark default behavior backward compatible
	Revert "ext4: use ext4_write_inode() when fsyncing w/o a journal"
	libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
	xfrm: refine validation of template and selector families
	batman-adv: Avoid WARN on net_device without parent in netns
	batman-adv: Force mac header to start of data on xmit
	svcrdma: Reduce max_send_sges
	svcrdma: Remove max_sge check at connect time
	Linux 4.19.22

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 58d81256 6f8c14ee

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 21

SUBLEVEL = 22

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/da850.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ 
		clocksource: timer@20000 {

			compatible = "ti,da830-timer";

			reg = <0x20000 0x1000>;

			interrupts = <12>, <13>;

			interrupts = <21>, <22>;

			interrupt-names = "tint12", "tint34";

			clocks = <&pll0_auxclk>;

		};

arch/arm/mach-iop32x/n2100.c

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ void __init n2100_map_io(void) 
/*

 * N2100 PCI.

 */

static int __init

n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	int irq;

arch/arm/mach-tango/pm.c

+2 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/suspend.h>

#include <asm/suspend.h>

#include "smc.h"

#include "pm.h"



static int tango_pm_powerdown(unsigned long arg)

{
@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = { 
	.valid = suspend_valid_only_mem,

};



static int __init tango_pm_init(void)

void __init tango_pm_init(void)

{

	suspend_set_ops(&tango_pm_ops);

	return 0;

}
 


late_initcall(tango_pm_init);

arch/arm/mach-tango/pm.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifdef CONFIG_SUSPEND

void __init tango_pm_init(void);

#else

#define tango_pm_init NULL

#endif