Commit 3e8b1d41 authored Apr 28, 2020 by jianzhou

Merge android-4.9.219(6ee8be4d) into msm-4.9



* refs/heads/tmp-6ee8be4d:
  Linux 4.9.219
  drm/msm: Use the correct dma_sync calls in msm_gem
  drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read()
  usb: dwc3: don't set gadget->is_otg flag
  arm64: Fix size of __early_cpu_boot_status
  drm/msm: stop abusing dma_map/unmap for cache
  clk: qcom: rcg: Return failure for RCG update
  RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
  Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
  ceph: canonicalize server path in place
  ceph: remove the extra slashes in the server path
  IB/hfi1: Fix memory leaks in sysfs registration and unregistration
  IB/hfi1: Call kobject_put() when kobject_init_and_add() fails
  ASoC: jz4740-i2s: Fix divider written at incorrect offset in register
  tools/accounting/getdelays.c: fix netlink attribute length
  random: always use batched entropy for get_random_u{32,64}
  net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
  slcan: Don't transmit uninitialized stack data in padding
  net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
  net: dsa: bcm_sf2: Ensure correct sub-node is parsed
  mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
  padata: always acquire cpu_hotplug_lock before pinst->lock
  net: dsa: tag_brcm: Fix skb->fwd_offload_mark location
  coresight: do not use the BIT() macro in the UAPI header
  blk-mq: Allow blocking queue tag iter callbacks
  blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter
  drm/etnaviv: replace MMU flush marker with flush sequence
  sctp: fix possibly using a bad saddr with a given dst
  sctp: fix refcount bug in sctp_wfree
  net, ip_tunnel: fix interface lookup with no key
  ipv4: fix a RCU-list lock in fib_triestat_seq_show
  drm/bochs: downgrade pci_request_region failure from error to warning
  l2tp: fix race between l2tp_session_delete() and l2tp_tunnel_closeall()
  l2tp: ensure sessions are freed after their PPPOL2TP socket
  ANDROID: cuttlefish_defconfig: Minimally enable EFI

 Conflicts:
	drivers/char/random.c
	drivers/clk/qcom/clk-rcg2.c
	drivers/gpu/drm/msm/msm_gem.c
	drivers/net/phy/micrel.c
	drivers/usb/dwc3/gadget.c
	include/uapi/linux/coresight-stm.h

Change-Id: I8e014a8d407d4a02a4c1bf889168494c23a59788
Signed-off-by: jianzhou <jianzhou@codeaurora.org>

parents d2440d68 6ee8be4d

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 218
		SUBLEVEL = 219
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm64/configs/cuttlefish_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ CONFIG_SETEND_EMULATION=y
		CONFIG_ARM64_SW_TTBR0_PAN=y
		CONFIG_ARM64_LSE_ATOMICS=y
		CONFIG_RANDOMIZE_BASE=y
		# CONFIG_EFI is not set
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		CONFIG_COMPAT=y
		CONFIG_PM_WAKELOCKS=y
		@@ -422,6 +421,7 @@ CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=y
		CONFIG_TMPFS=y
		CONFIG_TMPFS_POSIX_ACL=y
		# CONFIG_EFIVAR_FS is not set
		CONFIG_SDCARD_FS=y
		CONFIG_PSTORE=y
		CONFIG_PSTORE_CONSOLE=y

arch/arm64/kernel/head.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -651,7 +651,7 @@ ENTRY(__boot_cpu_mode)
		* with MMU turned off.
		*/
		ENTRY(__early_cpu_boot_status)
		.long 0
		.quad 0

		.popsection

arch/x86/configs/x86_64_cuttlefish_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ CONFIG_KSM=y
		CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
		CONFIG_ZSMALLOC=y
		# CONFIG_MTRR is not set
		CONFIG_EFI=y
		CONFIG_HZ_100=y
		CONFIG_KEXEC=y
		CONFIG_CRASH_DUMP=y
		@@ -453,6 +454,7 @@ CONFIG_PROC_KCORE=y
		CONFIG_TMPFS=y
		CONFIG_TMPFS_POSIX_ACL=y
		CONFIG_HUGETLBFS=y
		# CONFIG_EFIVAR_FS is not set
		CONFIG_SDCARD_FS=y
		CONFIG_PSTORE=y
		CONFIG_PSTORE_CONSOLE=y

block/blk-mq-tag.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -336,6 +336,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;
		@@ -351,7 +358,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 unsigned int bt_unused_tags(const struct sbitmap_queue *bt)