From b9c040fc3123ddc1527bb38def2a062fdbb5fe57 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Mon, 30 Jan 2017 07:22:48 -0600 Subject: [PATCH] UBUNTU: Rebase to v4.10-rc6 Signed-off-by: Seth Forshee --- debian.master/changelog | 4 ++++ debian.master/config/amd64/config.common.amd64 | 2 -- debian.master/config/annotations | 4 +--- debian.master/config/arm64/config.common.arm64 | 2 -- debian.master/config/armhf/config.common.armhf | 2 -- debian.master/config/config.common.ubuntu | 5 ++--- debian.master/config/i386/config.common.i386 | 2 -- debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/powerpc/config.flavour.generic | 3 --- debian.master/config/powerpc/config.flavour.powerpc-e500mc | 3 --- debian.master/config/powerpc/config.flavour.powerpc-smp | 3 --- debian.master/config/powerpc/config.flavour.powerpc64-emb | 3 --- debian.master/config/ppc64el/config.common.ppc64el | 4 +--- 13 files changed, 9 insertions(+), 29 deletions(-) diff --git a/debian.master/changelog b/debian.master/changelog index dd2ed222d100..d57e3c1bf8af 100644 --- 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 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 023dcdb7573c..67c9e39814bb 100644 --- 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 5f3929bd8e82..ab169208aa9c 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8666,9 +8666,7 @@ CONFIG_RCU_EXPERT flag # 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 note +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 fbb9edda0cd4..c530b45fcfed 100644 --- 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 6dee335794d4..10a4c9b194ec 100644 --- 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 4e88ded7db75..fdb94f3306ed 100644 --- 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 c25951e59b50..f07299419af7 100644 --- 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 0e36261c1812..a3eff7b85ca9 100644 --- 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 c74a137848de..47e89311b52f 100644 --- 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 fb34000154be..9a706652c841 100644 --- 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 990dc462d49e..c37e0b6f6e80 100644 --- 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 69d28be16ff0..dd54f7d1d188 100644 --- 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 6a61a4c5f6ff..06ffd37837b4 100644 --- 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 -- 2.39.2