UBUNTU: Rebase to v4.10-rc6

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

diff --git a/debian.master/changelog b/debian.master/changelog
index dd2ed222d100b80ad500a2c7c24cf6306fa14d27..d57e3c1bf8afebe4d76a3ac1d1f1136d5ff70978 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (4.10.0-5.7) 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.10-rc6
+
  -- Tim Gardner <tim.gardner@canonical.com>  Tue, 24 Jan 2017 10:12:34 -0700
 
 linux (4.10.0-4.6) zesty; urgency=low

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 023dcdb7573c3b8849d90da8ebb49000f529f513..67c9e39814bbbc54beba98f2b95de577ea1eb8d3 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -72,8 +72,6 @@ CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE_PARTITION=y

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5f3929bd8e824846ec20491f0a7a332f949e15b6..ab169208aa9cc49fd2f7254dcb0673796aecc764 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8666,9 +8666,7 @@ CONFIG_RCU_EXPERT                               flag<REVIEW>
 # Menu: General setup >> Stack Protector buffer overflow detection
 CONFIG_CC_STACKPROTECTOR_NONE                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc-generic': 'n', 'powerpc-powerpc64-emb': 'n', 'powerpc-powerpc-e500mc': 'n', 'powerpc-powerpc-smp': 'y', 'ppc64el': 'n'}>
 CONFIG_CC_STACKPROTECTOR_REGULAR                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
-CONFIG_CC_STACKPROTECTOR_STRONG                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc-generic': 'y', 'powerpc-powerpc64-emb': 'y', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'n', 'ppc64el': 'y'}>
-#
-CONFIG_CC_STACKPROTECTOR_STRONG                        mark<ENFORCED> note<FTBFS on powerpc-smp in 4.10-rc2>
+CONFIG_CC_STACKPROTECTOR_STRONG                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y'}>
 
 # Menu: General setup >> Stack Protector buffer overflow detection >> Architecture: arm
 

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index fbb9edda0cd442c72f51a54ad0e8640271288bd6..c530b45fcfedcf1c3afbe844749d7b0cd6f9c781 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -78,8 +78,6 @@ CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE="console=ttyAMA0"

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 6dee335794d4df871e5adbf5270616e6cd7d4f0c..10a4c9b194ec7de83e2ea9621fecb04fb8cc8a44 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -72,8 +72,6 @@ CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE=""

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4e88ded7db75de0f1e44f6192fdf917fb36e6c35..fdb94f3306ed5abb2647cc816c509f225ac8c8df 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1198,7 +1198,9 @@ CONFIG_CCWGROUP=m
 CONFIG_CCW_CONSOLE=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 # CONFIG_CELL_CPU is not set
@@ -4391,7 +4393,6 @@ CONFIG_KGDB_LOW_LEVEL_TRAP=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS is not set
 CONFIG_KINGSUN_DONGLE=m
-CONFIG_KMSG_IDS=y
 CONFIG_KMX61=m
 CONFIG_KPROBES=y
 CONFIG_KPROBES_ON_FTRACE=y
@@ -7338,8 +7339,6 @@ CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_STATS is not set
-CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index c25951e59b50bcc93a4e114eaff5819c7829bd59..f07299419af708a413e68d5579d148a9e3a1b4a3 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -69,8 +69,6 @@ CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE_PARTITION=y

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 0e36261c1812b903cf811a1f9deca66cb7b49b3a..a3eff7b85ca9c58ba7734a6fb74ce2bdf6c7b781 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -56,6 +56,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
+# CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE_PARTITION=y

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index c74a137848ded263b5f9dd093c36c1772062f4fb..47e89311b52f0e8c3952cbfd67e18f5b22863c48 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -12,9 +12,6 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_ATA_NONSTANDARD=y
 # CONFIG_BATMAN_ADV_BATMAN_V is not set
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 CONFIG_CXL_AFU_DRIVER_OPS=y

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index fb34000154be760723857d7b92e837c4a2d10c45..9a706652c841cf944ce69962cddd78cecd31c86c 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -12,9 +12,6 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_RANDOM is not set
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 # CONFIG_CXL_AFU_DRIVER_OPS is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 990dc462d49e5b4d02454f209d2efecb098339e3..c37e0b6f6e80f4db167be9683626ad231b723c8b 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -12,9 +12,6 @@
 # CONFIG_ARCH_RANDOM is not set
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_BATMAN_ADV_BATMAN_V is not set
-# CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CC_STACKPROTECTOR_NONE=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index 69d28be16ff0e992c2df81955e7b29ddf0c8b622..dd54f7d1d188d37f660375e745813416b95f6d27 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -12,9 +12,6 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_RANDOM is not set
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 # CONFIG_CXL_AFU_DRIVER_OPS is not set

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 6a61a4c5f6ff46ea5b70aee54464f31b0ffc1fba..06ffd37837b46c812adc4c64795898883149772e 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -66,9 +66,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
+# CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE_PARTITION=y