Merge remote-tracking branch 'origin/f26' into f26-user-thl-vanilla-fedorakernel-4.11.8-300.vanilla.knurd.1.fc26

63 files changed, 237 insertions, 362 deletions

diff --git a/0001-netfilter-xtables-zero-padding-in-data_to_user.patch b/0001-netfilter-xtables-zero-padding-in-data_to_user.patch
deleted file mode 100644
index b23e387a6..000000000
--- a/0001-netfilter-xtables-zero-padding-in-data_to_user.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From b1a27013a72d5744be6510c05b86e1b9dd605012 Mon Sep 17 00:00:00 2001
-From: Willem de Bruijn <willemb@google.com>
-Date: Tue, 9 May 2017 16:17:37 -0400
-Subject: [PATCH 1/2] netfilter: xtables: zero padding in data_to_user
-
-When looking up an iptables rule, the iptables binary compares the
-aligned match and target data (XT_ALIGN). In some cases this can
-exceed the actual data size to include padding bytes.
-
-Before commit f77bc5b23fb1 ("iptables: use match, target and data
-copy_to_user helpers") the malloc()ed bytes were overwritten by the
-kernel with kzalloced contents, zeroing the padding and making the
-comparison succeed. After this patch, the kernel copies and clears
-only data, leaving the padding bytes undefined.
-
-Extend the clear operation from data size to aligned data size to
-include the padding bytes, if any.
-
-Padding bytes can be observed in both match and target, and the bug
-triggered, by issuing a rule with match icmp and target ACCEPT:
-
-  iptables -t mangle -A INPUT -i lo -p icmp --icmp-type 1 -j ACCEPT
-  iptables -t mangle -D INPUT -i lo -p icmp --icmp-type 1 -j ACCEPT
-
-Fixes: f77bc5b23fb1 ("iptables: use match, target and data copy_to_user helpers")
-Reported-by: Paul Moore <pmoore@redhat.com>
-Reported-by: Richard Guy Briggs <rgb@redhat.com>
-Signed-off-by: Willem de Bruijn <willemb@google.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter/x_tables.h | 2 +-
- net/bridge/netfilter/ebtables.c    | 9 ++++++---
- net/netfilter/x_tables.c           | 9 ++++++---
- 3 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
-index be378cf..b3044c2c 100644
---- a/include/linux/netfilter/x_tables.h
-+++ b/include/linux/netfilter/x_tables.h
-@@ -294,7 +294,7 @@ int xt_match_to_user(const struct xt_entry_match *m,
- int xt_target_to_user(const struct xt_entry_target *t,
- 		      struct xt_entry_target __user *u);
- int xt_data_to_user(void __user *dst, const void *src,
--		    int usersize, int size);
-+		    int usersize, int size, int aligned_size);
- 
- void *xt_copy_counters_from_user(const void __user *user, unsigned int len,
- 				 struct xt_counters_info *info, bool compat);
-diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index 79b6991..656c259 100644
---- a/net/bridge/netfilter/ebtables.c
-+++ b/net/bridge/netfilter/ebtables.c
-@@ -1358,7 +1358,8 @@ static inline int ebt_obj_to_user(char __user *um, const char *_name,
- 	strlcpy(name, _name, sizeof(name));
- 	if (copy_to_user(um, name, EBT_FUNCTION_MAXNAMELEN) ||
- 	    put_user(datasize, (int __user *)(um + EBT_FUNCTION_MAXNAMELEN)) ||
--	    xt_data_to_user(um + entrysize, data, usersize, datasize))
-+	    xt_data_to_user(um + entrysize, data, usersize, datasize,
-+			    XT_ALIGN(datasize)))
- 		return -EFAULT;
- 
- 	return 0;
-@@ -1643,7 +1644,8 @@ static int compat_match_to_user(struct ebt_entry_match *m, void __user **dstptr,
- 		if (match->compat_to_user(cm->data, m->data))
- 			return -EFAULT;
- 	} else {
--		if (xt_data_to_user(cm->data, m->data, match->usersize, msize))
-+		if (xt_data_to_user(cm->data, m->data, match->usersize, msize,
-+				    COMPAT_XT_ALIGN(msize)))
- 			return -EFAULT;
- 	}
- 
-@@ -1672,7 +1674,8 @@ static int compat_target_to_user(struct ebt_entry_target *t,
- 		if (target->compat_to_user(cm->data, t->data))
- 			return -EFAULT;
- 	} else {
--		if (xt_data_to_user(cm->data, t->data, target->usersize, tsize))
-+		if (xt_data_to_user(cm->data, t->data, target->usersize, tsize,
-+				    COMPAT_XT_ALIGN(tsize)))
- 			return -EFAULT;
- 	}
- 
-diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
-index 14857af..afb02fd 100644
---- a/net/netfilter/x_tables.c
-+++ b/net/netfilter/x_tables.c
-@@ -283,12 +283,13 @@ static int xt_obj_to_user(u16 __user *psize, u16 size,
- 		       &U->u.user.revision, K->u.kernel.TYPE->revision)
- 
- int xt_data_to_user(void __user *dst, const void *src,
--		    int usersize, int size)
-+		    int usersize, int size, int aligned_size)
- {
- 	usersize = usersize ? : size;
- 	if (copy_to_user(dst, src, usersize))
- 		return -EFAULT;
--	if (usersize != size && clear_user(dst + usersize, size - usersize))
-+	if (usersize != aligned_size &&
-+	    clear_user(dst + usersize, aligned_size - usersize))
- 		return -EFAULT;
- 
- 	return 0;
-@@ -298,7 +299,9 @@ EXPORT_SYMBOL_GPL(xt_data_to_user);
- #define XT_DATA_TO_USER(U, K, TYPE, C_SIZE)				\
- 	xt_data_to_user(U->data, K->data,				\
- 			K->u.kernel.TYPE->usersize,			\
--			C_SIZE ? : K->u.kernel.TYPE->TYPE##size)
-+			C_SIZE ? : K->u.kernel.TYPE->TYPE##size,	\
-+			C_SIZE ? COMPAT_XT_ALIGN(C_SIZE) :		\
-+				 XT_ALIGN(K->u.kernel.TYPE->TYPE##size))
- 
- int xt_match_to_user(const struct xt_entry_match *m,
- 		     struct xt_entry_match __user *u)
--- 
-2.7.5
-
diff --git a/0002-netfilter-xtables-fix-build-failure-from-COMPAT_XT_A.patch b/0002-netfilter-xtables-fix-build-failure-from-COMPAT_XT_A.patch
deleted file mode 100644
index 7786bf9d8..000000000
--- a/0002-netfilter-xtables-fix-build-failure-from-COMPAT_XT_A.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From d6b664f7f350dafd604fd014de20ea8e0f25b3b3 Mon Sep 17 00:00:00 2001
-From: Willem de Bruijn <willemb@google.com>
-Date: Wed, 17 May 2017 11:24:47 -0400
-Subject: [PATCH 2/2] netfilter: xtables: fix build failure from
- COMPAT_XT_ALIGN outside CONFIG_COMPAT
-
-The patch in the Fixes references COMPAT_XT_ALIGN in the definition
-of XT_DATA_TO_USER, outside an #ifdef CONFIG_COMPAT block.
-
-Split XT_DATA_TO_USER into separate compat and non compat variants and
-define the first inside an CONFIG_COMPAT block.
-
-This simplifies both variants by removing branches inside the macro.
-
-Fixes: 324318f0248c ("netfilter: xtables: zero padding in data_to_user")
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Willem de Bruijn <willemb@google.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/x_tables.c | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
-index afb02fd..32488c0 100644
---- a/net/netfilter/x_tables.c
-+++ b/net/netfilter/x_tables.c
-@@ -296,18 +296,17 @@ int xt_data_to_user(void __user *dst, const void *src,
- }
- EXPORT_SYMBOL_GPL(xt_data_to_user);
- 
--#define XT_DATA_TO_USER(U, K, TYPE, C_SIZE)				\
-+#define XT_DATA_TO_USER(U, K, TYPE)					\
- 	xt_data_to_user(U->data, K->data,				\
- 			K->u.kernel.TYPE->usersize,			\
--			C_SIZE ? : K->u.kernel.TYPE->TYPE##size,	\
--			C_SIZE ? COMPAT_XT_ALIGN(C_SIZE) :		\
--				 XT_ALIGN(K->u.kernel.TYPE->TYPE##size))
-+			K->u.kernel.TYPE->TYPE##size,			\
-+			XT_ALIGN(K->u.kernel.TYPE->TYPE##size))
- 
- int xt_match_to_user(const struct xt_entry_match *m,
- 		     struct xt_entry_match __user *u)
- {
- 	return XT_OBJ_TO_USER(u, m, match, 0) ||
--	       XT_DATA_TO_USER(u, m, match, 0);
-+	       XT_DATA_TO_USER(u, m, match);
- }
- EXPORT_SYMBOL_GPL(xt_match_to_user);
- 
-@@ -315,7 +314,7 @@ int xt_target_to_user(const struct xt_entry_target *t,
- 		      struct xt_entry_target __user *u)
- {
- 	return XT_OBJ_TO_USER(u, t, target, 0) ||
--	       XT_DATA_TO_USER(u, t, target, 0);
-+	       XT_DATA_TO_USER(u, t, target);
- }
- EXPORT_SYMBOL_GPL(xt_target_to_user);
- 
-@@ -614,6 +613,12 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
- }
- EXPORT_SYMBOL_GPL(xt_compat_match_from_user);
- 
-+#define COMPAT_XT_DATA_TO_USER(U, K, TYPE, C_SIZE)			\
-+	xt_data_to_user(U->data, K->data,				\
-+			K->u.kernel.TYPE->usersize,			\
-+			C_SIZE,						\
-+			COMPAT_XT_ALIGN(C_SIZE))
-+
- int xt_compat_match_to_user(const struct xt_entry_match *m,
- 			    void __user **dstptr, unsigned int *size)
- {
-@@ -629,7 +634,7 @@ int xt_compat_match_to_user(const struct xt_entry_match *m,
- 		if (match->compat_to_user((void __user *)cm->data, m->data))
- 			return -EFAULT;
- 	} else {
--		if (XT_DATA_TO_USER(cm, m, match, msize - sizeof(*cm)))
-+		if (COMPAT_XT_DATA_TO_USER(cm, m, match, msize - sizeof(*cm)))
- 			return -EFAULT;
- 	}
- 
-@@ -984,7 +989,7 @@ int xt_compat_target_to_user(const struct xt_entry_target *t,
- 		if (target->compat_to_user((void __user *)ct->data, t->data))
- 			return -EFAULT;
- 	} else {
--		if (XT_DATA_TO_USER(ct, t, target, tsize - sizeof(*ct)))
-+		if (COMPAT_XT_DATA_TO_USER(ct, t, target, tsize - sizeof(*ct)))
- 			return -EFAULT;
- 	}
- 
--- 
-2.7.5
-
diff --git a/baseconfig/CONFIG_BT_QCOMSMD b/baseconfig/CONFIG_BT_QCOMSMD
deleted file mode 100644
index d67bc39b0..000000000
--- a/baseconfig/CONFIG_BT_QCOMSMD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BT_QCOMSMD is not set
diff --git a/baseconfig/CONFIG_PINCTRL_MSM8994 b/baseconfig/CONFIG_PINCTRL_MSM8994
index 5dd58e746..977b1c3c4 100644
--- a/baseconfig/CONFIG_PINCTRL_MSM8994
+++ b/baseconfig/CONFIG_PINCTRL_MSM8994
@@ -1 +1 @@
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
diff --git a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084 b/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
index 5ce9e62f4..bacb61e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
+++ b/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
@@ -1 +1 @@
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
diff --git a/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD b/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD
new file mode 100644
index 000000000..9f36fb6a8
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD
@@ -0,0 +1 @@
+CONFIG_BT_QCOMSMD=m
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
index ec4000095..2b7c64357 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
+++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
@@ -1 +1 @@
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
index e305e243b..87b627906 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
@@ -1 +1 @@
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY
new file mode 100644
index 000000000..397f69094
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY
new file mode 100644
index 000000000..7595ae205
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
new file mode 100644
index 000000000..5d86a4597
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY
new file mode 100644
index 000000000..ea1c4f918
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL
new file mode 100644
index 000000000..16ac280e6
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_PLL=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
index 457d918ff..9effe8611 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
@@ -1 +1 @@
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
index f65dc3662..87cf3fd89 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
@@ -1 +1 @@
-# CONFIG_MSM_GCC_8916 is not set
+CONFIG_MSM_GCC_8916=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
index a492a6821..03ba44b34 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
@@ -1 +1 @@
-CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_GCC_8960=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
index 62f48a9e8..8ffbd8055 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
@@ -1 +1 @@
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8974=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
index 166ddcce5..4b01d318d 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
@@ -1 +1 @@
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG b/baseconfig/arm/arm64/CONFIG_RPMSG
new file mode 100644
index 000000000..7cc8785d0
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_RPMSG
@@ -0,0 +1 @@
+CONFIG_RPMSG=m
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD b/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD
new file mode 100644
index 000000000..f65af3d10
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD
@@ -0,0 +1 @@
+CONFIG_RPMSG_QCOM_SMD=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
new file mode 100644
index 000000000..207a5e523
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
new file mode 100644
index 000000000..db12f036e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084 b/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
index 5ce9e62f4..bacb61e5e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
+++ b/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
@@ -1 +1 @@
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD b/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
new file mode 100644
index 000000000..9f36fb6a8
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
@@ -0,0 +1 @@
+CONFIG_BT_QCOMSMD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
index ec4000095..2b7c64357 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
+++ b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
@@ -1 +1 @@
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
index e305e243b..87b627906 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
@@ -1 +1 @@
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
new file mode 100644
index 000000000..397f69094
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
new file mode 100644
index 000000000..7595ae205
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
new file mode 100644
index 000000000..5d86a4597
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
new file mode 100644
index 000000000..ea1c4f918
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
new file mode 100644
index 000000000..16ac280e6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_PLL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
index 457d918ff..9effe8611 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
@@ -1 +1 @@
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
index a492a6821..03ba44b34 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
@@ -1 +1 @@
-CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_GCC_8960=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
index 62f48a9e8..8ffbd8055 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
@@ -1 +1 @@
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8974=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
index 166ddcce5..4b01d318d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
@@ -1 +1 @@
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
new file mode 100644
index 000000000..7cc8785d0
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
@@ -0,0 +1 @@
+CONFIG_RPMSG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
new file mode 100644
index 000000000..f65af3d10
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD
@@ -0,0 +1 @@
+CONFIG_RPMSG_QCOM_SMD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
new file mode 100644
index 000000000..207a5e523
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
new file mode 100644
index 000000000..db12f036e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
diff --git a/bcm283x-vc4-fix-vblank.patch b/bcm283x-vc4-fix-vblank.patch
index fc0d033b1..ea7153d21 100644
--- a/bcm283x-vc4-fix-vblank.patch
+++ b/bcm283x-vc4-fix-vblank.patch
@@ -1,49 +1,7 @@
-From e487709ee89a572a3a8068f33e9275479fde9bf4 Mon Sep 17 00:00:00 2001
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-Date: Fri, 16 Jun 2017 10:30:33 +0200
-Subject: [PATCH 1/2] drm/vc4: Send a VBLANK event when disabling a CRTC
-
-VBLANK events are missed when the CRTC is being disabled because the
-driver does not wait till the end of the frame before stopping the
-HVS and PV blocks. In this case, we should explicitly issue a VBLANK
-event if there's one waiting.
-
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 9fcf05ca492b..66cffc548af2 100644
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -526,6 +526,19 @@ static void vc4_crtc_disable(struct drm_crtc *crtc)
- 	WARN_ON_ONCE((HVS_READ(SCALER_DISPSTATX(chan)) &
- 		      (SCALER_DISPSTATX_FULL | SCALER_DISPSTATX_EMPTY)) !=
- 		     SCALER_DISPSTATX_EMPTY);
-+
-+	/*
-+	 * Make sure we issue a vblank event after disabling the CRTC if
-+	 * someone was waiting it.
-+	 */
-+	if (crtc->state->event) {
-+		unsigned long flags;
-+
-+		spin_lock_irqsave(&dev->event_lock, flags);
-+		drm_crtc_send_vblank_event(crtc, crtc->state->event);
-+		crtc->state->event = NULL;
-+		spin_unlock_irqrestore(&dev->event_lock, flags);
-+	}
- }
- 
- static void vc4_crtc_enable(struct drm_crtc *crtc)
--- 
-2.13.0
-
-From 6c9d1ad4c10657d7d6f8455088686abee1805102 Mon Sep 17 00:00:00 2001
+From 5db729b12376b0b6507503eee1dcbe5f3b089686 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Mon, 26 Jun 2017 09:03:28 +0100
-Subject: [PATCH 2/2] drm/vc4: Fix VBLANK handling in crtc->enable() path
+Date: Wed, 28 Jun 2017 10:49:18 +0100
+Subject: [PATCH] drm/vc4: Fix VBLANK handling in crtc->enable() path
 
 When we are enabling a CRTC, drm_crtc_vblank_get() is called before
 drm_crtc_vblank_on(), which is not supposed to happen (hence the
@@ -56,11 +14,11 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  1 file changed, 43 insertions(+), 23 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 66cffc548af2..47a8ef0a755d 100644
+index 9fcf05ca492b..138c406f4f77 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -541,6 +541,34 @@ static void vc4_crtc_disable(struct drm_crtc *crtc)
- 	}
+@@ -528,6 +528,34 @@ static void vc4_crtc_disable(struct drm_crtc *crtc)
+ 		     SCALER_DISPSTATX_EMPTY);
  }
  
 +static void vc4_crtc_update_dlist(struct drm_crtc *crtc)
@@ -94,7 +52,7 @@ index 66cffc548af2..47a8ef0a755d 100644
  static void vc4_crtc_enable(struct drm_crtc *crtc)
  {
  	struct drm_device *dev = crtc->dev;
-@@ -551,6 +579,12 @@ static void vc4_crtc_enable(struct drm_crtc *crtc)
+@@ -538,6 +566,12 @@ static void vc4_crtc_enable(struct drm_crtc *crtc)
  
  	require_hvs_enabled(dev);
  
@@ -107,7 +65,7 @@ index 66cffc548af2..47a8ef0a755d 100644
  	/* Turn on the scaler, which will wait for vstart to start
  	 * compositing.
  	 */
-@@ -562,9 +596,6 @@ static void vc4_crtc_enable(struct drm_crtc *crtc)
+@@ -549,9 +583,6 @@ static void vc4_crtc_enable(struct drm_crtc *crtc)
  	/* Turn on the pixel valve, which will emit the vstart signal. */
  	CRTC_WRITE(PV_V_CONTROL,
  		   CRTC_READ(PV_V_CONTROL) | PV_VCONTROL_VIDEN);
@@ -117,7 +75,7 @@ index 66cffc548af2..47a8ef0a755d 100644
  }
  
  static bool vc4_crtc_mode_fixup(struct drm_crtc *crtc,
-@@ -619,7 +650,6 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
+@@ -606,7 +637,6 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
  {
  	struct drm_device *dev = crtc->dev;
  	struct vc4_dev *vc4 = to_vc4_dev(dev);
@@ -125,7 +83,7 @@ index 66cffc548af2..47a8ef0a755d 100644
  	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
  	struct drm_plane *plane;
  	bool debug_dump_regs = false;
-@@ -641,25 +671,15 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
+@@ -628,25 +658,15 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
  
  	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm.size);
  
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a6a98dbc9..be7db65e6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -191,7 +191,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -649,7 +649,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -855,7 +855,7 @@ CONFIG_COMMON_CLK_HI3660=y
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -1237,7 +1237,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3081,12 +3086,12 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
-# CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8660=y
+CONFIG_MSM_GCC_8916=y
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
@@ -3926,7 +3931,7 @@ CONFIG_PINCTRL_MAX77620=m
 # CONFIG_PINCTRL_MSM8660 is not set
 CONFIG_PINCTRL_MSM8916=y
 # CONFIG_PINCTRL_MSM8960 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_MSM8996=y
 # CONFIG_PINCTRL_MSM8X74 is not set
 CONFIG_PINCTRL_MSM=y
@@ -4271,6 +4276,8 @@ CONFIG_ROCKETPORT=m
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPMSG=m
+CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5057,8 +5064,8 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 584c29b57..147f5982e 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -191,7 +191,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -649,7 +649,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -855,7 +855,7 @@ CONFIG_COMMON_CLK_HI3660=y
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -1227,7 +1227,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3060,12 +3065,12 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
-# CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8660=y
+CONFIG_MSM_GCC_8916=y
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
@@ -3905,7 +3910,7 @@ CONFIG_PINCTRL_MAX77620=m
 # CONFIG_PINCTRL_MSM8660 is not set
 CONFIG_PINCTRL_MSM8916=y
 # CONFIG_PINCTRL_MSM8960 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_MSM8996=y
 # CONFIG_PINCTRL_MSM8X74 is not set
 CONFIG_PINCTRL_MSM=y
@@ -4249,6 +4254,8 @@ CONFIG_ROCKETPORT=m
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPMSG=m
+CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5034,8 +5041,8 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d122ac284..d586c5724 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -174,7 +174,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -694,7 +694,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -903,7 +903,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -1333,7 +1333,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3305,12 +3310,12 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
 # CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_IOMMU is not set
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
@@ -4238,7 +4243,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MVEBU=y
@@ -4625,6 +4630,8 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG=m
+CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5493,8 +5500,8 @@ CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f759c246c..7566b5a15 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -672,7 +672,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -4015,7 +4014,7 @@ CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_SAMSUNG=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 2022e40f1..d8c5fe69e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -671,7 +671,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3994,7 +3993,7 @@ CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_SAMSUNG=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 1551876a5..d30e7008c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -174,7 +174,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -693,7 +693,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -902,7 +902,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -1323,7 +1323,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3284,12 +3289,12 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
 # CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_IOMMU is not set
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
@@ -4217,7 +4222,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MVEBU=y
@@ -4603,6 +4608,8 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG=m
+CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -5470,8 +5477,8 @@ CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7549dc914..2aea378ca 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -570,7 +570,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3787,7 +3786,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 577f8321a..c54f6d3f6 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -571,7 +571,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3807,7 +3806,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 77b378c98..040cafd1d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -571,7 +571,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3807,7 +3806,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 74ba762ec..ebd395d57 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -570,7 +570,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3787,7 +3786,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 56d7caaf2..39b92b8a2 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -557,7 +557,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3602,7 +3601,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 82d0b268f..7e02528f0 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -556,7 +556,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3580,7 +3579,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 930511ad3..20c5da78d 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -514,7 +514,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3545,7 +3544,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 2572ac0c2..25685bb4d 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -513,7 +513,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3523,7 +3522,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index c86635edc..4f635774c 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -514,7 +514,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3544,7 +3543,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 8fdb4e921..5e9a27925 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -513,7 +513,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3522,7 +3521,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e40f9b544..97766d594 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -512,7 +512,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3470,7 +3469,7 @@ CONFIG_PHYLIB=m
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d16f20afa..51a0ae6d8 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -511,7 +511,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3448,7 +3447,7 @@ CONFIG_PHYLIB=m
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 70b25cbc6..89f96c4d8 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -574,7 +574,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3833,7 +3832,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index fe49a0222..bd24389ab 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -573,7 +573,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3813,7 +3812,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
diff --git a/kernel.spec b/kernel.spec
index 6b7cc3749..2a76f5bcb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 %define stable_rc 0
 
 # Do we have a -stable update to apply?
-%define stable_update 7
+%define stable_update 8
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -573,6 +573,10 @@ Patch432: arm64-cavium-fixes.patch
 
 Patch433: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
 
+# https://patchwork.kernel.org/patch/9815555/
+# https://patchwork.kernel.org/patch/9815651/
+Patch434: qcom-rmsg-spmi-fixes.patch
+
 # http://www.spinics.net/lists/devicetree/msg163238.html
 Patch440: bcm2837-initial-support.patch
 
@@ -683,11 +687,6 @@ Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch
 # rhbz 1459326
 Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch
 
-# rhbz 1459676
-Patch686: 0001-netfilter-xtables-zero-padding-in-data_to_user.patch
-Patch687: 0002-netfilter-xtables-fix-build-failure-from-COMPAT_XT_A.patch
-
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2256,6 +2255,16 @@ fi
 #
 #
 %changelog
+* Thu Jun 29 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.8-300
+- Linux v4.11.8
+
+* Wed Jun 28 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Tweak vc4 vblank for stability
+- Fix for early boot on Dragonboard 410c
+
+* Mon Jun 26 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Config improvements for Qualcomm devices
+
 * Mon Jun 26 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.7-300
 - Linux v4.11.7
 - Make CONFIG_SERIAL_8250_PCI builtin (rhbz 1464709)
diff --git a/qcom-rmsg-spmi-fixes.patch b/qcom-rmsg-spmi-fixes.patch
new file mode 100644
index 000000000..7aa1ca18c
--- /dev/null
+++ b/qcom-rmsg-spmi-fixes.patch
@@ -0,0 +1,85 @@
+From patchwork Wed Jun 28 21:53:23 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2] rpmsg: Make modalias work for DeviceTree based devices
+From: Bjorn Andersson <bjorn.andersson@linaro.org>
+X-Patchwork-Id: 9815555
+Message-Id: <20170628215323.5658-1-bjorn.andersson@linaro.org>
+To: Ohad Ben-Cohen <ohad@wizery.com>,
+ Bjorn Andersson <bjorn.andersson@linaro.org>
+Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
+ Rob Clark <robdclark@gmail.com>
+Date: Wed, 28 Jun 2017 14:53:23 -0700
+
+When rpmsg devices are expected to be matched based on their compatible
+the modalias should reflect this, so that module autoloading has a
+chance to match and load the appropriate module.
+
+Tested-by: Rob Clark <robdclark@gmail.com>
+Reported-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+---
+
+Changes since v1:
+- Also update rpmsg_uevent()
+
+ drivers/rpmsg/rpmsg_core.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
+index ad3d2a9df287..067650c5bcb6 100644
+--- a/drivers/rpmsg/rpmsg_core.c
++++ b/drivers/rpmsg/rpmsg_core.c
+@@ -343,6 +343,11 @@ static ssize_t modalias_show(struct device *dev,
+ 			     struct device_attribute *attr, char *buf)
+ {
+ 	struct rpmsg_device *rpdev = to_rpmsg_device(dev);
++	ssize_t len;
++
++	len = of_device_modalias(dev, buf, PAGE_SIZE);
++	if (len != -ENODEV)
++		return len;
+ 
+ 	return sprintf(buf, RPMSG_DEVICE_MODALIAS_FMT "\n", rpdev->id.name);
+ }
+@@ -387,6 +392,11 @@ static int rpmsg_dev_match(struct device *dev, struct device_driver *drv)
+ static int rpmsg_uevent(struct device *dev, struct kobj_uevent_env *env)
+ {
+ 	struct rpmsg_device *rpdev = to_rpmsg_device(dev);
++	int ret;
++
++	ret = of_device_uevent_modalias(dev, env);
++	if (ret != -ENODEV)
++		return ret;
+ 
+ 	return add_uevent_var(env, "MODALIAS=" RPMSG_DEVICE_MODALIAS_FMT,
+ 					rpdev->id.name);
+diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
+index 2b9b0941d9eb..6d23226e5f69 100644
+--- a/drivers/spmi/spmi.c
++++ b/drivers/spmi/spmi.c
+@@ -365,11 +365,23 @@ static int spmi_drv_remove(struct device *dev)
+ 	return 0;
+ }
+ 
++static int spmi_drv_uevent(struct device *dev, struct kobj_uevent_env *env)
++{
++	int ret;
++
++	ret = of_device_uevent_modalias(dev, env);
++	if (ret != -ENODEV)
++		return ret;
++
++	return 0;
++}
++
+ static struct bus_type spmi_bus_type = {
+ 	.name		= "spmi",
+ 	.match		= spmi_device_match,
+ 	.probe		= spmi_drv_probe,
+ 	.remove		= spmi_drv_remove,
++	.uevent		= spmi_drv_uevent,
+ };
+ 
+ /**
diff --git a/sources b/sources
index 01896ee9c..0126b6b21 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-SHA512 (patch-4.11.7.xz) = 8f02b3ae83cf499f59912207821d67a1e5a0cdb7d53644a2685ac8187fa43e39b0af4c64de2d299c389c4a85c011513a78f33297d8521eb99ef58b287bf9962a
+SHA512 (patch-4.11.8.xz) = 9fed139ec4658d373ea6f25b0cc0cd9384e3bf61a05d30a523c13d8b5e673b461cf3cc8d97da2c69ca3a6c718319529f7ccfd90ca38b81d68986b7e63f2db297