Merge tag 'LA.UM.8.4.r1-05700-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998

* tag 'LA.UM.8.4.r1-05700-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
  msm: adsprpc: Fix array index underflow problem
  profiler: Fix compilation errors
  fbdev: msm: fix ret value while translating to mdp format
  clk: msm: Fix compilation errors with clang
  ath10k: Fix compilation issue
  drm/msm/sde: Fix clang compilation in SDE driver
  ais: cam_soc_api: Fix compilation error
  msm: camera: reset atomic variable
  msm: v4l2loopback: Fix clang compilation error
  msm: Fix compilation error
  asoc: msm-8998: Add new FE's for TDM Primary
  diag: dci: Synchronize dci mempool buffers alloc and free
  headers_lib: rename Android.bp
  kbuild: skip install/check of headers right under uapi directories
  uapi: export all arch specifics directories
  kernel_headers: Fix headers not detected in incremental builds
  kernel headers: Update comparison logic
  Kbuild : Use no-export-headers to avoid exporting headers
  kernel_headers: kernel headers library package
  kbuild: replace genhdr-y with generated-y
  uapi: export all headers under uapi directories
  uapi: sound: move necessary sound headers under uapi
  kernel: Fix build errors with LLVM
  Revert "ARM: dts: msm: Remove cpu max frequency restriction on cold temp for msm8996."
  ARM: dts: msm: Remove cpu max frequency restriction on cold temp for msm8996.
  input: touchpanel: Fix compilation errors with clang
  asoc: msm-8998: TDM device grouping changes for capture path
  kbuild, x86: Track generated headers with generated-y
  kbuild: Remove stale asm-generic wrappers
  ARM: put types.h in uapi
  msm: ais: jpegdma: Fix uninitialized variable
  Makefile.headersinst: remove destination-y option
  msm: adsprpc: DSP device node to provide restricted access to ADSP/SLPI

Conflicts:
	.gitignore
	drivers/mmc/core/sdio_cis.c

Change-Id: I70cf2a0fbcfcbc834a21cf7fa8db9bd2e1c755b1

5 files changed, 11 insertions, 10 deletions

diff --git a/drivers/soc/qcom/msm_bus/msm_bus_dbg.c b/drivers/soc/qcom/msm_bus/msm_bus_dbg.c
index 444d79fa061f..b8963a00374c 100644
--- a/drivers/soc/qcom/msm_bus/msm_bus_dbg.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_dbg.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2012, 2014-2015, 2017 The Linux Foundation. All rights
- * reserved.
+/* Copyright (c) 2010-2012, 2014-2015, 2017, 2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
diff --git a/drivers/soc/qcom/msm_bus/msm_bus_rules.c b/drivers/soc/qcom/msm_bus/msm_bus_rules.c
index cafddcd65561..bd032c900624 100644
--- a/drivers/soc/qcom/msm_bus/msm_bus_rules.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_rules.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2017, 2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
diff --git a/drivers/soc/qcom/msm_performance.c b/drivers/soc/qcom/msm_performance.c
index 1857d369bc94..8b78ac889eac 100644
--- a/drivers/soc/qcom/msm_performance.c
+++ b/drivers/soc/qcom/msm_performance.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2018, 2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -2728,9 +2728,9 @@ error:
 	for (i = 0; i < num_clusters; i++) {
 		if (!managed_clusters[i])
 			break;
-		if (managed_clusters[i]->offlined_cpus)
+		if (managed_clusters[i]->offlined_cpus != NULL)
 			free_cpumask_var(managed_clusters[i]->offlined_cpus);
-		if (managed_clusters[i]->cpus)
+		if (managed_clusters[i]->cpus != NULL)
 			free_cpumask_var(managed_clusters[i]->cpus);
 		kfree(managed_clusters[i]);
 	}
diff --git a/drivers/soc/qcom/qdsp6v2/apr.c b/drivers/soc/qcom/qdsp6v2/apr.c
index ba5be240dfea..3060308652d5 100644
--- a/drivers/soc/qcom/qdsp6v2/apr.c
+++ b/drivers/soc/qcom/qdsp6v2/apr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014, 2016, 2018-2019 The Linux Foundation.
+/* Copyright (c) 2010-2014, 2016, 2018-2020 The Linux Foundation.
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/soc/qcom/system_stats.c b/drivers/soc/qcom/system_stats.c
index ba35928a991b..30e15a0a2c9a 100644
--- a/drivers/soc/qcom/system_stats.c
+++ b/drivers/soc/qcom/system_stats.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016, 2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -298,6 +298,7 @@ static int msm_rpmstats_probe(struct platform_device *pdev)
 	void __iomem *offset_addr = NULL;
 	struct resource res;
 	int i, ret = 0;
+	size_t master_name_len = 0;
 
 	if (!pdev)
 		return -EINVAL;
@@ -365,7 +366,7 @@ static int msm_rpmstats_probe(struct platform_device *pdev)
 	 * Read master names from DT
 	 */
 	for (i = 0; i < ss.num_masters; i++) {
-		const char *master_name;
+		const char *master_name = NULL;
 
 		of_property_read_string_index(pdev->dev.of_node,
 				"qcom,masters",
@@ -377,8 +378,9 @@ static int msm_rpmstats_probe(struct platform_device *pdev)
 			pr_err("%s:Failed to get memory\n", __func__);
 			return -ENOMEM;
 		}
+		master_name_len = strlen(master_name);
 		strlcpy(ss.master[i], master_name,
-					strlen(master_name) + 1);
+					master_name_len + 1);
 	}
 
 	dent = debugfs_create_file("system_stats", S_IRUGO, NULL,