From: Tim Gardner Date: Mon, 12 Sep 2016 12:41:47 +0000 (-0600) Subject: UBUNTU: rebase to v4.8-rc6 X-Git-Tag: Ubuntu-4.10.0-9.11~387 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bbfe466117a4a41609306310968408cde7449d78;p=mirror_ubuntu-zesty-kernel.git UBUNTU: rebase to v4.8-rc6 Signed-off-by: Tim Gardner --- diff --git a/debian.master/changelog b/debian.master/changelog index 6885352423fe..8e4e20ef356b 100644 --- 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 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 12cc7b9a9f34..9c34cb4479a9 100644 --- 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 5154b56fb48a..6a7a0ce15cef 100644 --- 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 83b908767cc0..50bb5d88730a 100644 --- 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