diff --git a/drivers/platform/msm/msm_ext_display.c b/drivers/platform/msm/msm_ext_display.c
index 414ebd45299d..1fbd8fc561b6 100644
--- a/drivers/platform/msm/msm_ext_display.c
+++ b/drivers/platform/msm/msm_ext_display.c
@@ -13,6 +13,7 @@
 #include <linux/iopoll.h>
 #include <linux/types.h>
 #include <linux/of_platform.h>
+#include <linux/extcon-provider.h>
 #include <linux/msm_ext_display.h>
 #include <linux/extcon-provider.h>
 
diff --git a/drivers/rpmsg/qcom_glink_spi.c b/drivers/rpmsg/qcom_glink_spi.c
index 58c6370538d2..4b31b34273bd 100644
--- a/drivers/rpmsg/qcom_glink_spi.c
+++ b/drivers/rpmsg/qcom_glink_spi.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -533,7 +533,7 @@ static void glink_spi_rx_advance(struct glink_spi *glink, size_t count)
 	pipe->local_addr = tail;
 	ret = glink_spi_reg_write(glink, pipe->tail_addr, tail);
 	if (ret)
-		GLINK_ERR(glink, "Error writing rx tail\n", ret);
+		GLINK_ERR(glink, "Error writing rx tail\n");
 }
 
 static size_t glink_spi_tx_avail(struct glink_spi *glink)
@@ -890,7 +890,7 @@ static int glink_spi_request_intent(struct glink_spi *glink,
 	req.param1 = cpu_to_le16(channel->lcid);
 	req.param2 = cpu_to_le32(size);
 
-	CH_INFO(channel, "size:%d\n", size);
+	CH_INFO(channel, "size:%zd\n", size);
 
 	ret = glink_spi_tx(glink, &req, sizeof(req), NULL, 0, true);
 	if (ret)
@@ -951,7 +951,8 @@ static int glink_spi_handle_intent(struct glink_spi *glink,
 		intent->size = le32_to_cpu(intents[i].size);
 		intent->addr = (u32)le64_to_cpu(intents[i].addr);
 
-		CH_INFO(channel, "riid:%d size:%d\n", intent->id, intent->size);
+		CH_INFO(channel, "riid:%d size:%zd\n", intent->id,
+			intent->size);
 
 		spin_lock_irqsave(&channel->intent_lock, flags);
 		ret = idr_alloc(&channel->riids, intent,
@@ -1076,7 +1077,7 @@ static int glink_spi_advertise_intent(struct glink_spi *glink,
 	cmd.size = cpu_to_le32(intent->size);
 	cmd.liid = cpu_to_le32(intent->id);
 
-	CH_INFO(channel, "count:%d size:%d liid:%d\n", 1,
+	CH_INFO(channel, "count:%d size:%zd liid:%d\n", 1,
 		intent->size, intent->id);
 
 	glink_spi_tx(glink, &cmd, sizeof(cmd), NULL, 0, true);
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index f4e13bd4dccd..aee25042fb55 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -15,6 +15,7 @@ config QCOM_COMMAND_DB
 
 config QCOM_MEM_OFFLINE
 	bool "Dynamic Memory Region Offline driver"
+	depends on MEMORY_HOTPLUG
 	help
 	  Add support for DDR Self-Refresh power management through the dynamic
 	  memory offline framework. This driver interfaces between the memory
diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c
index d3469fbc5207..ae6fe65a5d67 100644
--- a/drivers/thermal/fair_share.c
+++ b/drivers/thermal/fair_share.c
@@ -52,7 +52,7 @@ static int get_trip_level(struct thermal_zone_device *tz)
 	 */
 	if (count > 0) {
 		tz->ops->get_trip_type(tz, count - 1, &trip_type);
-		trace_thermal_zone_trip(tz, count - 1, trip_type);
+		trace_thermal_zone_trip(tz, count - 1, trip_type, 1);
 	}
 
 	return count;