UBUNTU: rebase to v4.8-rc6

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 6885352423fec264560a256416665db39a4499ee..8e4e20ef356b21033ba920d67d1b2ad727223aee 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,11 @@ linux (4.8.0-8.9) 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.8-rc6
+    - LP: #1617900
+
  -- Tim Gardner <tim.gardner@canonical.com>  Fri, 09 Sep 2016 10:53:40 -0600
 
 linux (4.8.0-7.8) yakkety; urgency=low

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 12cc7b9a9f345b22a47fc3a0c034e8790c823ff9..9c34cb4479a9c477ae87ac69b6cf8f3574670d22 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -421,7 +421,6 @@ CONFIG_GIGASET_CAPI=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
 CONFIG_GPIO_ML_IOH=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 5154b56fb48a599508cde39884eac595945edec9..6a7a0ce15cef7926975c465dd31399686007de9c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2529,6 +2529,7 @@ CONFIG_HAMACHI=m
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_PAGESPAN=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_HAS_DMA=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 83b908767cc0c5b0e4737fa88a5b167c15566ca9..50bb5d88730a3977d3629d16f810043ae77b78c8 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -275,7 +275,6 @@ CONFIG_FRAME_WARN=2048
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
 CONFIG_GPIO_ML_IOH=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set