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

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

Merge 4.19.60 into android-4.19-q 



Changes in 4.19.60
	Revert "e1000e: fix cyclic resets at link up with active tx"
	e1000e: start network tx queue only when link is up
	Input: synaptics - enable SMBUS on T480 thinkpad trackpad
	nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
	drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
	firmware: improve LSM/IMA security behaviour
	irqchip/gic-v3-its: Fix command queue pointer comparison bug
	clk: ti: clkctrl: Fix returning uninitialized data
	efi/bgrt: Drop BGRT status field reserved bits check
	perf/core: Fix perf_sample_regs_user() mm check
	ARM: dts: gemini Fix up DNS-313 compatible string
	ARM: omap2: remove incorrect __init annotation
	afs: Fix uninitialised spinlock afs_volume::cb_break_lock
	x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz
	be2net: fix link failure after ethtool offline test
	ppp: mppe: Add softdep to arc4
	sis900: fix TX completion
	ARM: dts: imx6ul: fix PWM[1-4] interrupts
	pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order
	dm table: don't copy from a NULL pointer in realloc_argv()
	dm verity: use message limit for data block corruption message
	x86/boot/64: Fix crash if kernel image crosses page table boundary
	x86/boot/64: Add missing fixup_pointer() for next_early_pgt access
	HID: chicony: add another quirk for PixArt mouse
	HID: multitouch: Add pointstick support for ALPS Touchpad
	pinctrl: mediatek: Ignore interrupts that are wake only during resume
	cpu/hotplug: Fix out-of-bounds read when setting fail state
	pinctrl: mediatek: Update cur_mask in mask/mask ops
	linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL
	genirq: Delay deactivation in free_irq()
	genirq: Fix misleading synchronize_irq() documentation
	genirq: Add optional hardware synchronization for shutdown
	x86/ioapic: Implement irq_get_irqchip_state() callback
	x86/irq: Handle spurious interrupt after shutdown gracefully
	x86/irq: Seperate unused system vectors from spurious entry again
	ARC: hide unused function unw_hdr_alloc
	s390: fix stfle zero padding
	s390/qdio: (re-)initialize tiqdio list entries
	s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
	crypto: talitos - move struct talitos_edesc into talitos.h
	crypto: talitos - fix hash on SEC1.
	crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
	regmap-irq: do not write mask register if mask_base is zero
	drm/udl: introduce a macro to convert dev to udl.
	drm/udl: Replace drm_dev_unref with drm_dev_put
	drm/udl: move to embedding drm device inside udl device.
	x86/entry/32: Fix ENDPROC of common_spurious
	Linux 4.19.60

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I89c0a7b2e3ea20782b6e9207f86dff3923d14178
parents 2b34bd7b be9b6782

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

VERSION = 4

PATCHLEVEL = 19

PATCHLEVEL = 19

SUBLEVEL = 59

SUBLEVEL = 60

EXTRAVERSION =

EXTRAVERSION =

NAME = "People's Front"

NAME = "People's Front"

arch/arc/kernel/unwind.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -185,11 +185,6 @@ static void *__init unw_hdr_alloc_early(unsigned long sz) 
				       MAX_DMA_ADDRESS);

				       MAX_DMA_ADDRESS);

}

}





static void *unw_hdr_alloc(unsigned long sz)

{

	return kmalloc(sz, GFP_KERNEL);

}



static void init_unwind_table(struct unwind_table *table, const char *name,

static void init_unwind_table(struct unwind_table *table, const char *name,

			      const void *core_start, unsigned long core_size,

			      const void *core_start, unsigned long core_size,

			      const void *init_start, unsigned long init_size,

			      const void *init_start, unsigned long init_size,
@@ -370,6 +365,10 @@ static void init_unwind_hdr(struct unwind_table *table, 
}

}





#ifdef CONFIG_MODULES

#ifdef CONFIG_MODULES

static void *unw_hdr_alloc(unsigned long sz)

{

	return kmalloc(sz, GFP_KERNEL);

}





static struct unwind_table *last_table;

static struct unwind_table *last_table;

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 




/ {

/ {

	model = "D-Link DNS-313 1-Bay Network Storage Enclosure";

	model = "D-Link DNS-313 1-Bay Network Storage Enclosure";

	compatible = "dlink,dir-313", "cortina,gemini";

	compatible = "dlink,dns-313", "cortina,gemini";

	#address-cells = <1>;

	#address-cells = <1>;

	#size-cells = <1>;

	#size-cells = <1>;

arch/arm/boot/dts/imx6ul.dtsi

+4 −4
Original line number Original line Diff line number Diff line
@@ -359,7 +359,7 @@ 
			pwm1: pwm@2080000 {

			pwm1: pwm@2080000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02080000 0x4000>;

				reg = <0x02080000 0x4000>;

				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM1>,

				clocks = <&clks IMX6UL_CLK_PWM1>,

					 <&clks IMX6UL_CLK_PWM1>;

					 <&clks IMX6UL_CLK_PWM1>;

				clock-names = "ipg", "per";

				clock-names = "ipg", "per";
@@ -370,7 +370,7 @@ 
			pwm2: pwm@2084000 {

			pwm2: pwm@2084000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02084000 0x4000>;

				reg = <0x02084000 0x4000>;

				interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM2>,

				clocks = <&clks IMX6UL_CLK_PWM2>,

					 <&clks IMX6UL_CLK_PWM2>;

					 <&clks IMX6UL_CLK_PWM2>;

				clock-names = "ipg", "per";

				clock-names = "ipg", "per";
@@ -381,7 +381,7 @@ 
			pwm3: pwm@2088000 {

			pwm3: pwm@2088000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02088000 0x4000>;

				reg = <0x02088000 0x4000>;

				interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM3>,

				clocks = <&clks IMX6UL_CLK_PWM3>,

					 <&clks IMX6UL_CLK_PWM3>;

					 <&clks IMX6UL_CLK_PWM3>;

				clock-names = "ipg", "per";

				clock-names = "ipg", "per";
@@ -392,7 +392,7 @@ 
			pwm4: pwm@208c000 {

			pwm4: pwm@208c000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x0208c000 0x4000>;

				reg = <0x0208c000 0x4000>;

				interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM4>,

				clocks = <&clks IMX6UL_CLK_PWM4>,

					 <&clks IMX6UL_CLK_PWM4>;

					 <&clks IMX6UL_CLK_PWM4>;

				clock-names = "ipg", "per";

				clock-names = "ipg", "per";

arch/arm/mach-omap2/prm3xxx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -433,7 +433,7 @@ static void omap3_prm_reconfigure_io_chain(void) 
 * registers, and omap3xxx_prm_reconfigure_io_chain() must be called.

 * registers, and omap3xxx_prm_reconfigure_io_chain() must be called.

 * No return value.

 * No return value.

 */

 */

static void __init omap3xxx_prm_enable_io_wakeup(void)

static void omap3xxx_prm_enable_io_wakeup(void)

{

{

	if (prm_features & PRM_HAS_IO_WAKEUP)

	if (prm_features & PRM_HAS_IO_WAKEUP)

		omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,

		omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,