Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

14 files changed, 28 insertions, 10 deletions

diff --git a/configs/fedora/debug/CONFIG_ARM_PTDUMP b/configs/fedora/debug/CONFIG_ARM_PTDUMP
new file mode 100644
index 000000000..298538404
--- /dev/null
+++ b/configs/fedora/debug/CONFIG_ARM_PTDUMP
@@ -0,0 +1 @@
+CONFIG_ARM_PTDUMP=y
diff --git a/configs/fedora/debug/CONFIG_ARM_PTDUMP_DEBUGFS b/configs/fedora/debug/CONFIG_ARM_PTDUMP_DEBUGFS
new file mode 100644
index 000000000..9cb6f8821
--- /dev/null
+++ b/configs/fedora/debug/CONFIG_ARM_PTDUMP_DEBUGFS
@@ -0,0 +1 @@
+CONFIG_ARM_PTDUMP_DEBUGFS=y
diff --git a/gitrev b/gitrev
index f862a08ad..8213fd9fa 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-5997aab0a11ea27ee8e520ecc551ed18fd3e8296
+bee797529d7c1ea4e2803fda067d20edbc00bc3d
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index de1c7da11..79872f45a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -329,8 +329,8 @@ CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
-# CONFIG_ARM_PTDUMP is not set
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_ARM_SCMI_CPUFREQ=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 94273e58d..ab8a752bf 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -350,8 +350,8 @@ CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
-# CONFIG_ARM_PTDUMP is not set
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
 CONFIG_ARM_SCMI_POWER_DOMAIN=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 00c24470b..171bce527 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -338,8 +338,8 @@ CONFIG_ARM_PL172_MPMC=m
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_ARM_PSCI=y
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
-# CONFIG_ARM_PTDUMP is not set
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
 CONFIG_ARM_SCMI_POWER_DOMAIN=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 786372648..d02b8373e 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -250,6 +250,8 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 93532bff5..95f708f64 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -250,6 +250,8 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 84f7a7631..578e5f307 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -201,6 +201,8 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2a92e6987..d42a27fb0 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -194,6 +194,8 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index f24593051..c64fd0b1b 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -198,6 +198,8 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYNC_RAID6_TEST=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index b42e231f6..c3968c12a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -253,6 +253,8 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
+CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
diff --git a/kernel.spec b/kernel.spec
index 9c63cfd79..05c456702 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,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 1
+%define debugbuildsenabled 0
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -1873,6 +1873,10 @@ fi
 #
 #
 %changelog
+* Thu May 24 2018 Justin M. Forbes <jforbes@redhat.com> - 4.17.0-0.rc6.git2.1
+- Linux v4.17-rc6-158-gbee797529d7c
+- Reenable debugging options.
+
 * Mon May 21 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc6.git1.1
 - Linux v4.17-rc6-146-g5997aab0a11e
 
diff --git a/sources b/sources
index 9841d55ab..d9fb196d0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 SHA512 (patch-4.17-rc6.xz) = d8d67897e741b5ba91dbb3c6660e9289364938755f2f03031264206e85dd9b2a5101e36b4736ced9b58d092573ef5943c0cfd8d929da85143be2215b10478c55
-SHA512 (patch-4.17-rc6-git1.xz) = d1fcccfd5721d593ab0998397f6ef89866f761ac44120c7d0d692c062d9906b81ec0c29c51869f7ef0e5549321f7809092c1fd0ee86657b7a5fd41da96da0d58
+SHA512 (patch-4.17-rc6-git2.xz) = a68c80ec48cc9bb99cd3b8b2e71a05d97ccc8acf9441f93d71413e4e63a76b69a2996061e7015a5a66061a923e1efa711f66c02a96ee13075165df2a165f6168