Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc3.git4.1.vanilla.knurd.1.fc24

9 files changed, 21 insertions, 15 deletions

diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC b/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
index 42b81a044..d24825e16 100644
--- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
+++ b/baseconfig/arm/arm64/CONFIG_PINCTRL_QCOM_SPMI_PMIC
@@ -1 +1 @@
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
diff --git a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI b/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
index 0c319596b..eba374b73 100644
--- a/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
+++ b/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
@@ -1 +1 @@
-CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_SPMI=y
diff --git a/baseconfig/arm/arm64/CONFIG_SPMI b/baseconfig/arm/arm64/CONFIG_SPMI
index b340c89e6..4ce4dfde9 100644
--- a/baseconfig/arm/arm64/CONFIG_SPMI
+++ b/baseconfig/arm/arm64/CONFIG_SPMI
@@ -1 +1 @@
-CONFIG_SPMI=m
+CONFIG_SPMI=y
diff --git a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB b/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB
index 813a8d1d9..bd46b497a 100644
--- a/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB
+++ b/baseconfig/arm/arm64/CONFIG_SPMI_MSM_PMIC_ARB
@@ -1 +1 @@
-CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_SPMI_MSM_PMIC_ARB=y
diff --git a/gitrev b/gitrev
index 64cb07b59..741833e70 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-19ec50a438c2ea3e370f6d453bf2f2e6e45ef72b
+869c058fbe741cadff09647c68dbeae7d012f52d
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 45f7a87ae..44fefa8d1 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4067,7 +4067,7 @@ CONFIG_PINCTRL_MSM8996=y
 # CONFIG_PINCTRL_MSM8X74 is not set
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_SINGLE=y
@@ -4318,7 +4318,7 @@ CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=m
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_SPMI=y
 CONFIG_REGMAP=y
 CONFIG_REGULATOR_ACT8865=m
 # CONFIG_REGULATOR_AD5398 is not set
@@ -5402,8 +5402,8 @@ CONFIG_SPI_THUNDERX=m
 CONFIG_SPI_XLP=m
 CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
-CONFIG_SPMI=m
-CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_SPMI_MSM_PMIC_ARB=y
+CONFIG_SPMI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_LZ4=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2d3d223c3..eaf600cf9 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4046,7 +4046,7 @@ CONFIG_PINCTRL_MSM8996=y
 # CONFIG_PINCTRL_MSM8X74 is not set
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_PINCTRL_SINGLE=y
@@ -4296,7 +4296,7 @@ CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=m
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_SPMI=y
 CONFIG_REGMAP=y
 CONFIG_REGULATOR_ACT8865=m
 # CONFIG_REGULATOR_AD5398 is not set
@@ -5379,8 +5379,8 @@ CONFIG_SPI_THUNDERX=m
 CONFIG_SPI_XLP=m
 CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
-CONFIG_SPMI=m
-CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_SPMI_MSM_PMIC_ARB=y
+CONFIG_SPMI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_LZ4=y
diff --git a/kernel.spec b/kernel.spec
index f959981b0..f2534cc3f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 3
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2216,6 +2216,12 @@ fi
 #
 #
 %changelog
+* Fri Aug  4 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARM QCom updates
+
+* Fri Aug 04 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc3.git4.1
+- Linux v4.13-rc3-152-g869c058fbe74
+
 * Thu Aug 03 2017 Laura Abbott <labbott@redhat.com>
 - Keep UDF in the main kernel package (rhbz 1471314)
 
diff --git a/sources b/sources
index cef4dcba8..7bc5d5bbe 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
 SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 SHA512 (patch-4.13-rc3.xz) = ac0e314aaf166ea27cc1dac23b00f816983f1b0d97d1cd72f86544ac1f2d01f6583c14eab88076bec619a49df94f27cb2b4ec054ff5f5bddbead6ce05c42d17d
-SHA512 (patch-4.13-rc3-git3.xz) = 9fc821dd57c730b8739f14603aeecb3bd21c1b1b1002d1d531b1967dbc79a5d341041b76b293483bf3cd22f0310d87756fdbbf0b2d125a9912038dee262f38d5
+SHA512 (patch-4.13-rc3-git4.xz) = 3a67b4a8addce158ae1bcedef25ec9806ce4f479acd0da80f25058e8b0f429c67f64cd48f87d18777bf54c03ce3f07264f45b18072934f8e4196fa9fd650d53b