Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc4.git0.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc4.git0.1.vanilla.knurd.1.fc26

22 files changed, 32 insertions, 5 deletions

diff --git a/configs/base-generic/CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW b/configs/base-generic/CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW
new file mode 100644
index 000000000..23e8ade16
--- /dev/null
+++ b/configs/base-generic/CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW
@@ -0,0 +1 @@
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
diff --git a/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_E1041 b/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_E1041
new file mode 100644
index 000000000..f0d31a87b
--- /dev/null
+++ b/configs/base-generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_E1041
@@ -0,0 +1 @@
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ce9bcd14d..44f165806 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3920,6 +3920,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
@@ -4262,6 +4263,7 @@ CONFIG_QCOM_COINCELL=m
 CONFIG_QCOM_EMAC=m
 # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 # CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HIDMA=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index bee85ce54..52144db1c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3899,6 +3899,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
@@ -4240,6 +4241,7 @@ CONFIG_QCOM_COINCELL=m
 CONFIG_QCOM_EMAC=m
 # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 # CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HIDMA=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 1dad6897b..9a013793e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4202,6 +4202,7 @@ CONFIG_ORION_WATCHDOG=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 72a53962a..dc0960df5 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3985,6 +3985,7 @@ CONFIG_ORION_WATCHDOG=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 99b555960..ce1c2057c 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3964,6 +3964,7 @@ CONFIG_ORION_WATCHDOG=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 15eea61d4..5db29a722 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4181,6 +4181,7 @@ CONFIG_ORION_WATCHDOG=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 9bc749412..8c2aaece9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3765,6 +3765,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index f507009e0..2cf7da05d 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3785,6 +3785,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c860806ca..d0ebe24e2 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3785,6 +3785,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 51c3b1690..2d277a3d1 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3765,6 +3765,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 18056866c..c2f943803 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3597,6 +3597,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index a124f112c..db9741c64 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3575,6 +3575,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index beaab351d..6ad305601 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3541,6 +3541,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 719aa9e91..4c343ecc9 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3519,6 +3519,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index dc3c26f62..4e949a02d 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3473,6 +3473,7 @@ CONFIG_ORINOCO_USB=m
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6428cf9df..eca0d1125 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3451,6 +3451,7 @@ CONFIG_ORINOCO_USB=m
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index ba270556a..c060c15d9 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3836,6 +3836,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 80a1a3c70..90a988c4b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3816,6 +3816,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_P54_COMMON=m
 CONFIG_P54_PCI=m
diff --git a/kernel.spec b/kernel.spec
index 856769466..402feb44b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 3
+%global rcrev 4
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -2210,6 +2210,12 @@ fi
 #
 #
 %changelog
+* Mon Dec 18 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc4.git0.1
+- Linux v4.15-rc4
+
+* Mon Dec 18 2017 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
 * Fri Dec 15 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc3.git4.1
 - Linux v4.15-rc3-86-g032b4cc8ff84
 
diff --git a/sources b/sources
index d5a75b18f..a7fed5a44 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
-SHA512 (patch-4.15-rc3.xz) = a29fbd30eebad701232aecb078a84591850702a95a66d5900c02ee95bae234e6a38b9d62029a4cb5aa286c326bce0ee47cce01bdafcaf2bc4e02b82ec046bcdd
-SHA512 (patch-4.15-rc3-git4.xz) = 5bca8ece2c1b2492203e60b537bb4de2fd509d87c7b9ea58370b555ed2049986d15ed0290a73971dd21720e9c579e12206bf8d38333f420baae3b240dc6d0c26
+SHA512 (patch-4.15-rc4.xz) = e09460a100f4fd6b88503ea9328e0f7463616139152091f0eb5709c7eddb1c7c49c9f80433329be8f7f03f30d82fbf1cdfd020e84656e130d63380eac1858de7