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

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

Merge 4.14.176 into android-4.14-stable 



Changes in 4.14.176
	ipv4: fix a RCU-list lock in fib_triestat_seq_show
	net, ip_tunnel: fix interface lookup with no key
	sctp: fix refcount bug in sctp_wfree
	sctp: fix possibly using a bad saddr with a given dst
	drm/bochs: downgrade pci_request_region failure from error to warning
	initramfs: restore default compression behavior
	tools/power turbostat: Fix gcc build warnings
	drm/etnaviv: replace MMU flush marker with flush sequence
	blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter
	blk-mq: Allow blocking queue tag iter callbacks
	misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
	coresight: do not use the BIT() macro in the UAPI header
	padata: always acquire cpu_hotplug_lock before pinst->lock
	mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
	ipv6: don't auto-add link-local address to lag ports
	net: dsa: bcm_sf2: Ensure correct sub-node is parsed
	net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
	net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
	slcan: Don't transmit uninitialized stack data in padding
	mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
	random: always use batched entropy for get_random_u{32,64}
	tools/accounting/getdelays.c: fix netlink attribute length
	hwrng: imx-rngc - fix an error path
	ASoC: jz4740-i2s: Fix divider written at incorrect offset in register
	IB/hfi1: Call kobject_put() when kobject_init_and_add() fails
	IB/hfi1: Fix memory leaks in sysfs registration and unregistration
	ceph: remove the extra slashes in the server path
	ceph: canonicalize server path in place
	Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
	RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
	fbcon: fix null-ptr-deref in fbcon_switch
	acpi/nfit: Fix bus command validation
	clk: qcom: rcg: Return failure for RCG update
	drm/msm: stop abusing dma_map/unmap for cache
	arm64: Fix size of __early_cpu_boot_status
	rpmsg: glink: Remove chunk size word align warning
	usb: dwc3: don't set gadget->is_otg flag
	drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read()
	rpmsg: glink: smem: Support rx peak for size less than 4 bytes
	drm/msm: Use the correct dma_sync calls in msm_gem
	Linux 4.14.176

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I15dbb5a2b6b015683408249990a95894658f611a
parents 54d0217f c10b57a5

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 175

SUBLEVEL = 176

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ ENTRY(__boot_cpu_mode) 
 * with MMU turned off.

 */

ENTRY(__early_cpu_boot_status)

	.long 	0

	.quad 	0



	.popsection

block/blk-mq-tag.c

+8 −1
Original line number Diff line number Diff line
@@ -334,6 +334,13 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, 
	struct blk_mq_hw_ctx *hctx;

	int i;



	/*

	 * __blk_mq_update_nr_hw_queues will update the nr_hw_queues and

	 * queue_hw_ctx after freeze the queue, so we use q_usage_counter

	 * to avoid race with it.

	 */

	if (!percpu_ref_tryget(&q->q_usage_counter))

		return;



	queue_for_each_hw_ctx(q, hctx, i) {

		struct blk_mq_tags *tags = hctx->tags;
@@ -349,7 +356,7 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, 
			bt_for_each(hctx, &tags->breserved_tags, fn, priv, true);

		bt_for_each(hctx, &tags->bitmap_tags, fn, priv, false);

	}



	blk_queue_exit(q);

}



static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth,

block/blk-mq.c

+4 −0
Original line number Diff line number Diff line
@@ -2748,6 +2748,10 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, 


	list_for_each_entry(q, &set->tag_list, tag_set_list)

		blk_mq_unfreeze_queue(q);

	/*

	 * Sync with blk_mq_queue_tag_busy_iter.

	 */

	synchronize_rcu();

}



void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)

drivers/acpi/nfit/core.c

+13 −11
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int cmd_to_func(struct nfit_mem *nfit_mem, unsigned int cmd, 
	if (call_pkg) {

		int i;



		if (nfit_mem->family != call_pkg->nd_family)

		if (nfit_mem && nfit_mem->family != call_pkg->nd_family)

			return -ENOTTY;



		for (i = 0; i < ARRAY_SIZE(call_pkg->nd_reserved2); i++)
@@ -223,6 +223,10 @@ static int cmd_to_func(struct nfit_mem *nfit_mem, unsigned int cmd, 
		return call_pkg->nd_command;

	}



	/* In the !call_pkg case, bus commands == bus functions */

	if (!nfit_mem)

		return cmd;



	/* Linux ND commands == NVDIMM_FAMILY_INTEL function numbers */

	if (nfit_mem->family == NVDIMM_FAMILY_INTEL)

		return cmd;
@@ -238,6 +242,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
		unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)

{

	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);

	struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);

	union acpi_object in_obj, in_buf, *out_obj;

	const struct nd_cmd_desc *desc = NULL;

	struct device *dev = acpi_desc->dev;
@@ -252,18 +257,18 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
	if (cmd_rc)

		*cmd_rc = -EINVAL;



	if (cmd == ND_CMD_CALL)

		call_pkg = buf;

	func = cmd_to_func(nfit_mem, cmd, call_pkg);

	if (func < 0)

		return func;



	if (nvdimm) {

		struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);

		struct acpi_device *adev = nfit_mem->adev;



		if (!adev)

			return -ENOTTY;



		if (cmd == ND_CMD_CALL)

			call_pkg = buf;

		func = cmd_to_func(nfit_mem, cmd, call_pkg);

		if (func < 0)

			return func;

		dimm_name = nvdimm_name(nvdimm);

		cmd_name = nvdimm_cmd_name(cmd);

		cmd_mask = nvdimm_cmd_mask(nvdimm);
@@ -274,11 +279,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
	} else {

		struct acpi_device *adev = to_acpi_dev(acpi_desc);



		func = cmd;

		cmd_name = nvdimm_bus_cmd_name(cmd);

		cmd_mask = nd_desc->cmd_mask;

		dsm_mask = cmd_mask;

		if (cmd == ND_CMD_CALL)

		dsm_mask = nd_desc->bus_dsm_mask;

		desc = nd_cmd_bus_desc(cmd);

		guid = to_nfit_uuid(NFIT_DEV_BUS);