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

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

Merge 4.19.239 into android-4.19-stable 



Changes in 4.19.239
	memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe
	net/sched: flower: fix parsing of ethertype following VLAN header
	veth: Ensure eth header is in skb's linear part
	gpiolib: acpi: use correct format characters
	mlxsw: i2c: Fix initialization error flow
	net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link
	sctp: Initialize daddr on peeled off socket
	testing/selftests/mqueue: Fix mq_perf_tests to free the allocated cpu set
	nfc: nci: add flush_workqueue to prevent uaf
	cifs: potential buffer overflow in handling symlinks
	drm/amd: Add USBC connector ID
	drm/amdkfd: Check for potential null return of kmalloc_array()
	Drivers: hv: vmbus: Prevent load re-ordering when reading ring buffer
	scsi: target: tcmu: Fix possible page UAF
	scsi: ibmvscsis: Increase INITIAL_SRP_LIMIT to 1024
	net: micrel: fix KS8851_MLL Kconfig
	ata: libata-core: Disable READ LOG DMA EXT for Samsung 840 EVOs
	gpu: ipu-v3: Fix dev_dbg frequency output
	arm64: alternatives: mark patch_alternative() as `noinstr`
	drm/amd/display: Fix allocate_mst_payload assert on resume
	scsi: mvsas: Add PCI ID of RocketRaid 2640
	drivers: net: slip: fix NPD bug in sl_tx_timeout()
	mm, page_alloc: fix build_zonerefs_node()
	mm: kmemleak: take a full lowmem check in kmemleak_*_phys()
	gcc-plugins: latent_entropy: use /dev/urandom
	ALSA: hda/realtek: Add quirk for Clevo PD50PNT
	ALSA: pcm: Test for "silence" field in struct "pcm_format_data"
	ipv6: fix panic when forwarding a pkt with no in6 dev
	ARM: davinci: da850-evm: Avoid NULL pointer dereference
	smp: Fix offline cpu check in flush_smp_call_function_queue()
	i2c: pasemi: Wait for write xfers to finish
	Linux 4.19.239

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia9e9320ce18a1d1b1f943adbafc1b80f33a9c3e0
parents 864405fc eadf658b

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 238

SUBLEVEL = 239

EXTRAVERSION =

NAME = "People's Front"

arch/arm/mach-davinci/board-da850-evm.c

+3 −1
Original line number Diff line number Diff line
@@ -1045,11 +1045,13 @@ static int __init da850_evm_config_emac(void) 
	int ret;

	u32 val;

	struct davinci_soc_info *soc_info = &davinci_soc_info;

	u8 rmii_en = soc_info->emac_pdata->rmii_en;

	u8 rmii_en;



	if (!machine_is_davinci_da850_evm())

		return 0;



	rmii_en = soc_info->emac_pdata->rmii_en;



	cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);



	val = __raw_readl(cfg_chip3_base);

arch/arm64/kernel/alternative.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct alt_region { 
/*

 * Check if the target PC is within an alternative block.

 */

static bool branch_insn_requires_update(struct alt_instr *alt, unsigned long pc)

static __always_inline bool branch_insn_requires_update(struct alt_instr *alt, unsigned long pc)

{

	unsigned long replptr = (unsigned long)ALT_REPL_PTR(alt);

	return !(pc >= replptr && pc <= (replptr + alt->alt_len));
@@ -50,7 +50,7 @@ static bool branch_insn_requires_update(struct alt_instr *alt, unsigned long pc) 


#define align_down(x, a)	((unsigned long)(x) & ~(((unsigned long)(a)) - 1))



static u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr, __le32 *altinsnptr)

static __always_inline u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr, __le32 *altinsnptr)

{

	u32 insn;
@@ -95,7 +95,7 @@ static u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr, __le32 *altinsnp 
	return insn;

}



static void patch_alternative(struct alt_instr *alt,

static noinstr void patch_alternative(struct alt_instr *alt,

			      __le32 *origptr, __le32 *updptr, int nr_inst)

{

	__le32 *replptr;

drivers/ata/libata-core.c

+3 −0
Original line number Diff line number Diff line
@@ -4598,6 +4598,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 840 EVO*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_NO_DMA_LOG |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 840*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 850*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

drivers/gpio/gpiolib-acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares, 
	pin = agpio->pin_table[0];



	if (pin <= 255) {

		char ev_name[5];

		sprintf(ev_name, "_%c%02hhX",

		char ev_name[8];

		sprintf(ev_name, "_%c%02X",

			agpio->triggering == ACPI_EDGE_SENSITIVE ? 'E' : 'L',

			pin);

		if (ACPI_SUCCESS(acpi_get_handle(handle, ev_name, &evt_handle)))