diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 2c885fe163cc..8e01716a30e7 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -57,7 +57,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-16ubuntu1) 11.2.0" +CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-18ubuntu1) 11.2.0" CONFIG_CDROM_PKTCDVD=m # CONFIG_CMA is not set CONFIG_CMDLINE_PARTITION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 5674cbdfde4a..ce6128bc8634 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11591,7 +11591,6 @@ CONFIG_READABLE_ASM policy<{'amd64': 'n', 'arm64': ' CONFIG_HEADERS_INSTALL policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_DEBUG_SECTION_MISMATCH policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_SECTION_MISMATCH_WARN_ONLY policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_FRAME_POINTER policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y'}> CONFIG_STACK_VALIDATION policy<{'amd64': 'y'}> CONFIG_VMLINUX_MAP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -13857,6 +13856,7 @@ CONFIG_LEGACY_VSYSCALL_NONE policy<{'amd64': 'n'}> CONFIG_LEGACY_VSYSCALL_XONLY flag # Menu: Security options +CONFIG_SLS policy<{'amd64': 'y'}> CONFIG_SECURITY_DMESG_RESTRICT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SECURITY_PERF_EVENTS_RESTRICT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SECURITYFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 11eb91570b19..7ec56b65af30 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -58,7 +58,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.2.0-16ubuntu1) 11.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" 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 6d830cccd8e6..aafef697e520 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -54,7 +54,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.2.0-16ubuntu1) 11.2.0" +CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" 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 c709acfc6e17..7f6c86aa69e6 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -903,7 +903,7 @@ CONFIG_AS_IS_GNU=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y -CONFIG_AS_VERSION=23790 +CONFIG_AS_VERSION=23800 CONFIG_AS_VFP_VMRS_FPINST=y CONFIG_AT76C50X_USB=m CONFIG_AT803X_PHY=m @@ -1559,6 +1559,7 @@ CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y CONFIG_CC_HAS_SANE_STACKPROTECTOR=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y +CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_UBSAN_BOUNDS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y @@ -5714,7 +5715,7 @@ CONFIG_LDISC_AUTOLOAD=y # CONFIG_LD_HEAD_STUB_CATCH is not set CONFIG_LD_IS_BFD=y CONFIG_LD_ORPHAN_WARN=y -CONFIG_LD_VERSION=23790 +CONFIG_LD_VERSION=23800 CONFIG_LEDS_88PM860X=m CONFIG_LEDS_AAEON=m CONFIG_LEDS_AAT1290=m @@ -7001,6 +7002,7 @@ CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_MV88E6XXX_PTP=y CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_SJA1105=m CONFIG_NET_DSA_SJA1105_PTP=y @@ -9938,6 +9940,7 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_MODE_SLIP6=y CONFIG_SLIP_SMART=y # CONFIG_SLOB is not set +CONFIG_SLS=y CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SLUB_DEBUG=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 1f1e61576888..621d22405a0c 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -53,7 +53,7 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (Ubuntu 11.2.0-16ubuntu1) 11.2.0" +CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="" diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 7aafb3d5b6a4..3a814dcd40c2 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -43,7 +43,7 @@ CONFIG_AUTOFS_FS=y # CONFIG_CAIF is not set # CONFIG_CAN is not set # CONFIG_CB710_CORE is not set -CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu 11.2.0-16ubuntu1) 11.2.0" +CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" # CONFIG_CDROM_PKTCDVD is not set CONFIG_CMA=y # CONFIG_CMDLINE_PARTITION is not set