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

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

Merge 4.19.150 into android-4.19-stable 



Changes in 4.19.150
	mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models
	USB: gadget: f_ncm: Fix NDP16 datagram validation
	gpio: mockup: fix resource leak in error path
	gpio: tc35894: fix up tc35894 interrupt configuration
	clk: socfpga: stratix10: fix the divider for the emac_ptp_free_clk
	vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock
	vsock/virtio: stop workers during the .remove()
	vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock()
	net: virtio_vsock: Enhance connection semantics
	Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
	ftrace: Move RCU is watching check after recursion check
	drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config
	drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices
	drm/sun4i: mixer: Extend regmap max_register
	net: dec: de2104x: Increase receive ring size for Tulip
	rndis_host: increase sleep time in the query-response loop
	nvme-core: get/put ctrl and transport module in nvme_dev_open/release()
	drivers/net/wan/lapbether: Make skb->protocol consistent with the header
	drivers/net/wan/hdlc: Set skb->protocol before transmitting
	mac80211: do not allow bigger VHT MPDUs than the hardware supports
	spi: fsl-espi: Only process interrupts for expected events
	nvme-fc: fail new connections to a deleted host or remote port
	gpio: sprd: Clear interrupt when setting the type as edge
	pinctrl: mvebu: Fix i2c sda definition for 98DX3236
	nfs: Fix security label length not being reset
	clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED
	iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()
	i2c: cpm: Fix i2c_ram structure
	Input: trackpoint - enable Synaptics trackpoints
	random32: Restore __latent_entropy attribute on net_rand_state
	mm: replace memmap_context by meminit_context
	mm: don't rely on system state to detect hot-plug operations
	net/packet: fix overflow in tpacket_rcv
	epoll: do not insert into poll queues until all sanity checks are done
	epoll: replace ->visited/visited_list with generation count
	epoll: EPOLL_CTL_ADD: close the race in decision to take fast path
	ep_create_wakeup_source(): dentry name can change under you...
	netfilter: ctnetlink: add a range check for l3/l4 protonum
	Linux 4.19.150

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib6f1b6fce01bec80efd4a905d03903ff20ca89be
parents 141de28f a1b977b4

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 149

SUBLEVEL = 150

EXTRAVERSION =

NAME = "People's Front"

arch/ia64/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ virtual_memmap_init(u64 start, u64 end, void *arg) 
	if (map_start < map_end)

		memmap_init_zone((unsigned long)(map_end - map_start),

				 args->nid, args->zone, page_to_pfn(map_start),

				 MEMMAP_EARLY, NULL);

				 MEMINIT_EARLY, NULL);

	return 0;

}
@@ -508,8 +508,8 @@ memmap_init (unsigned long size, int nid, unsigned long zone, 
	     unsigned long start_pfn)

{

	if (!vmem_map) {

		memmap_init_zone(size, nid, zone, start_pfn, MEMMAP_EARLY,

				NULL);

		memmap_init_zone(size, nid, zone, start_pfn,

				 MEMINIT_EARLY, NULL);

	} else {

		struct page *start;

		struct memmap_init_callback_data args;

drivers/base/node.c

+54 −30
Original line number Diff line number Diff line
@@ -414,10 +414,32 @@ static int __ref get_nid_for_pfn(unsigned long pfn) 
	return pfn_to_nid(pfn);

}



static int do_register_memory_block_under_node(int nid,

					       struct memory_block *mem_blk)

{

	int ret;



	/*

	 * If this memory block spans multiple nodes, we only indicate

	 * the last processed node.

	 */

	mem_blk->nid = nid;



	ret = sysfs_create_link_nowarn(&node_devices[nid]->dev.kobj,

				       &mem_blk->dev.kobj,

				       kobject_name(&mem_blk->dev.kobj));

	if (ret)

		return ret;



	return sysfs_create_link_nowarn(&mem_blk->dev.kobj,

				&node_devices[nid]->dev.kobj,

				kobject_name(&node_devices[nid]->dev.kobj));

}



/* register memory section under specified node if it spans that node */

int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg)

int register_mem_block_under_node_early(struct memory_block *mem_blk, void *arg)

{

	int ret, nid = *(int *)arg;

	int nid = *(int *)arg;

	unsigned long pfn, sect_start_pfn, sect_end_pfn;



	sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr);
@@ -437,36 +459,31 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg) 
		}



		/*

		 * We need to check if page belongs to nid only for the boot

		 * case, during hotplug we know that all pages in the memory

		 * block belong to the same node.

		 * We need to check if page belongs to nid only at the boot

		 * case because node's ranges can be interleaved.

		 */

		if (system_state == SYSTEM_BOOTING) {

		page_nid = get_nid_for_pfn(pfn);

		if (page_nid < 0)

			continue;

		if (page_nid != nid)

			continue;



		return do_register_memory_block_under_node(nid, mem_blk);

	}

	/* mem section does not span the specified node */

	return 0;

}



/*

		 * If this memory block spans multiple nodes, we only indicate

		 * the last processed node.

 * During hotplug we know that all pages in the memory block belong to the same

 * node.

 */

		mem_blk->nid = nid;



		ret = sysfs_create_link_nowarn(&node_devices[nid]->dev.kobj,

					&mem_blk->dev.kobj,

					kobject_name(&mem_blk->dev.kobj));

		if (ret)

			return ret;

static int register_mem_block_under_node_hotplug(struct memory_block *mem_blk,

						 void *arg)

{

	int nid = *(int *)arg;



		return sysfs_create_link_nowarn(&mem_blk->dev.kobj,

				&node_devices[nid]->dev.kobj,

				kobject_name(&node_devices[nid]->dev.kobj));

	}

	/* mem section does not span the specified node */

	return 0;

	return do_register_memory_block_under_node(nid, mem_blk);

}



/*
@@ -484,10 +501,17 @@ void unregister_memory_block_under_nodes(struct memory_block *mem_blk) 
			  kobject_name(&node_devices[mem_blk->nid]->dev.kobj));

}



int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn)

int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn,

		      enum meminit_context context)

{

	return walk_memory_range(start_pfn, end_pfn, (void *)&nid,

					register_mem_sect_under_node);

	walk_memory_blocks_func_t func;



	if (context == MEMINIT_HOTPLUG)

		func = register_mem_block_under_node_hotplug;

	else

		func = register_mem_block_under_node_early;



	return walk_memory_range(start_pfn, end_pfn, (void *)&nid, func);

}



#ifdef CONFIG_HUGETLBFS

drivers/clk/samsung/clk-exynos4.c

+2 −2
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ static const struct samsung_gate_clock exynos4210_gate_clks[] __initconst = { 
	GATE(CLK_PCIE, "pcie", "aclk133", GATE_IP_FSYS, 14, 0, 0),

	GATE(CLK_SMMU_PCIE, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0),

	GATE(CLK_MODEMIF, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, CLK_IGNORE_UNUSED, 0),

	GATE(CLK_SYSREG, "sysreg", "aclk100", E4210_GATE_IP_PERIR, 0,

			CLK_IGNORE_UNUSED, 0),

	GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0,
@@ -1113,7 +1113,7 @@ static const struct samsung_gate_clock exynos4x12_gate_clks[] __initconst = { 
		0),

	GATE(CLK_TSADC, "tsadc", "aclk133", E4X12_GATE_BUS_FSYS1, 16, 0, 0),

	GATE(CLK_MIPI_HSI, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, CLK_IGNORE_UNUSED, 0),

	GATE(CLK_SYSREG, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1,

			CLK_IGNORE_UNUSED, 0),

	GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0,

drivers/clk/socfpga/clk-s10.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { 
	{ STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux),

	  0, 0, 2, 0xB0, 1},

	{ STRATIX10_EMAC_PTP_FREE_CLK, "emac_ptp_free_clk", NULL, emac_ptp_free_mux,

	  ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 4, 0xB0, 2},

	  ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 2, 0xB0, 2},

	{ STRATIX10_GPIO_DB_FREE_CLK, "gpio_db_free_clk", NULL, gpio_db_free_mux,

	  ARRAY_SIZE(gpio_db_free_mux), 0, 0, 0, 0xB0, 3},

	{ STRATIX10_SDMMC_FREE_CLK, "sdmmc_free_clk", NULL, sdmmc_free_mux,