UBUNTU: rebase to v4.9-rc3

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

diff --git a/debian.master/changelog b/debian.master/changelog
index cac806e53ea1d4ebf34f30786756bc2d32df7893..c723addc8460e49f15d315beaa1fb9c233954b8d 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -6,6 +6,10 @@ linux (4.9.0-0.1) zesty; urgency=low
 
   [ Upstream Kernel Changes ]
 
+  * rebase to v4.9-rc3
+
+  [ Upstream Kernel Changes ]
+
   * rebase to v4.9-rc2
 
   [ Upstream Kernel Changes ]

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ecc34707f36f33d4173a6e119cba0b528f2e5110..42d839ca792e8f0be602571ee005fd90a4fc8dae 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -56,7 +56,6 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_BE2ISCSI=m
-CONFIG_BIG_KEYS=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index e526dde71580ae2ac8737d69fcb390083a34f13b..69bfa83f899a24ca3461e70cfac4579a2a52e6a8 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -64,7 +64,6 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_BE2ISCSI=m
-CONFIG_BIG_KEYS=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 9f4243d071ee488c1ae87b6129e174d2edd78335..6889fc19b7515b440b81fa0ac7620a9cc211ac9b 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -57,7 +57,6 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_BE2ISCSI=m
-CONFIG_BIG_KEYS=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index adbc56eaf478e459f2a648bc8ba867933fa8890e..e6fc1bd4741d89af87e6afe01874c99605855599 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -869,6 +869,7 @@ CONFIG_BGMAC=y
 CONFIG_BGMAC_PLATFORM=y
 CONFIG_BH1750=m
 CONFIG_BH1780=m
+CONFIG_BIG_KEYS=y
 CONFIG_BIG_LITTLE=y
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_AOUT=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 53b0e2cf05da21ade7e66d882d20ccc09de6a943..87d83515adb41f95847832bc2ad5021522234f44 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -54,7 +54,6 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_BE2ISCSI=m
-CONFIG_BIG_KEYS=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 7c6d2354293c72c72fd3e8d0222fd8c6ae84779b..53b13f30c9ac632b9e80c95084b0ae3097a0565d 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -40,7 +40,6 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_BE2ISCSI=m
-CONFIG_BIG_KEYS=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 37fec906696caaf934516fa5b16eedab3bd3c3b1..8a8ac17848d886106891af7a35591349bc58242a 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -50,7 +50,6 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_BCMA=m
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_BE2ISCSI=m
-CONFIG_BIG_KEYS=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 3cabcc79669277d12be16f5d0bd3f150a6c16600..7ec49a502b16203aab3a6849f08db1d6a1e076f5 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -40,7 +40,6 @@ CONFIG_ARCH_WANTS_UBSAN_NO_NULL=y
 # CONFIG_BCMA is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_BE2ISCSI is not set
-# CONFIG_BIG_KEYS is not set
 # CONFIG_BLK_CMDLINE_PARSER is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set