UBUNTU: Rebase to v4.15-rc6

Ignore: yes
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index abfd3b6eab3d02fbd56b3a2e2cddf6bfe4de3bc8..fae535803f4463327b39b6f3831c09644c890315 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (4.15.0-3.4) UNRELEASED; urgency=low
   CHANGELOG: Use the printchanges target to see the curent changes.
   CHANGELOG: Use the insertchanges target to create the final log.
 
+  [ Upstream Kernel Changes ]
+
+  * Rebase to v4.15-rc6
+
  -- Seth Forshee <seth.forshee@canonical.com>  Wed, 03 Jan 2018 11:23:58 -0600
 
 linux (4.15.0-2.3) bionic; urgency=low

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7204374423509074c4b3a76d8a6b5982a53dd630..2df7e9b1c04191fbe450f3bdfb8ff67bec53f4d1 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6361,6 +6361,7 @@ CONFIG_PADATA=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PALMAS_GPADC=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m