merge masterkernel-4.15.0-0.rc6.git0.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc6.git0.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc6.git0.1.vanilla.knurd.1.fc26

6 files changed, 15 insertions, 6 deletions

diff --git a/configs/base-generic/x86/x86_64/CONFIG_CPU_ISOLATION b/configs/base-generic/x86/x86_64/CONFIG_CPU_ISOLATION
new file mode 100644
index 000000000..da3a02c10
--- /dev/null
+++ b/configs/base-generic/x86/x86_64/CONFIG_CPU_ISOLATION
@@ -0,0 +1 @@
+CONFIG_CPU_ISOLATION=y
diff --git a/configs/base-generic/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION b/configs/base-generic/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION
new file mode 100644
index 000000000..6881a7757
--- /dev/null
+++ b/configs/base-generic/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION
@@ -0,0 +1 @@
+CONFIG_PAGE_TABLE_ISOLATION=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index d57f24884..8a70ee602 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -825,7 +825,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPU_ISOLATION is not set
+CONFIG_CPU_ISOLATION=y
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 CONFIG_CPUSETS=y
@@ -3848,6 +3848,7 @@ CONFIG_PACKET=y
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PANASONIC_LAPTOP=m
 # CONFIG_PANEL is not set
 # CONFIG_PANIC_ON_OOPS is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 026ed3344..1886919f5 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -824,7 +824,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE=y
-# CONFIG_CPU_ISOLATION is not set
+CONFIG_CPU_ISOLATION=y
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
@@ -3828,6 +3828,7 @@ CONFIG_PACKET=y
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PANASONIC_LAPTOP=m
 # CONFIG_PANEL is not set
 # CONFIG_PANIC_ON_OOPS is not set
diff --git a/kernel.spec b/kernel.spec
index 7e2bbb2f4..e3e2a267e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,7 +75,7 @@ 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 5
+%global rcrev 6
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -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}
@@ -2218,6 +2218,12 @@ fi
 #
 #
 %changelog
+* Mon Jan 01 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc6.git0.1
+- Linux v4.15-rc6
+
+* Mon Jan 01 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
 * Fri Dec 22 2017 Hans de Goede <jwrdegoede@fedoraproject.org>
 - Add patches which allow specifying a default SATA linkpower management policy
   for mobile chipsets and set the default LPM policy to "med_power_with_dipm"
diff --git a/sources b/sources
index 177c4406d..08f022dfd 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-rc4.xz) = e09460a100f4fd6b88503ea9328e0f7463616139152091f0eb5709c7eddb1c7c49c9f80433329be8f7f03f30d82fbf1cdfd020e84656e130d63380eac1858de7
-SHA512 (patch-4.15-rc4-git4.xz) = aac0a2dcf887d19a6f2d884ac964e21a52a93ce97fe30e33d9a8b0e0bb5cf70866b510eac17a52f0ea734bd1bb0d414ab7b504f8899d1a354d7c5831f87275b3
+SHA512 (patch-4.15-rc6.xz) = 45f97ae4216403ee3b3a7e9575610ff422b39650494e82cb194c996511911f2d5a4fdc42456841a083a0d450821648b611d7fd3538cbc3d5c1b2bcbd9486f884