From c0a6a093385f0daa1438e9b821b74a9b404085d8 Mon Sep 17 00:00:00 2001 From: Khalid Elmously Date: Fri, 16 Feb 2018 17:23:48 -0500 Subject: [PATCH] UBUNTU: Ubuntu-raspi2-4.13.0-1014.15 Signed-off-by: Khalid Elmously --- debian.raspi2/changelog | 14 +++++++++----- debian.raspi2/config/arm64/config.common.arm64 | 1 - debian.raspi2/config/armhf/config.common.armhf | 1 - debian.raspi2/config/config.common.ubuntu | 7 +------ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/debian.raspi2/changelog b/debian.raspi2/changelog index 394a64ea5e51..649269cb2863 100644 --- a/debian.raspi2/changelog +++ b/debian.raspi2/changelog @@ -1,10 +1,14 @@ -linux-raspi2 (4.13.0-1014.15) UNRELEASED; urgency=medium +linux-raspi2 (4.13.0-1014.15) artful; urgency=medium - CHANGELOG: Do not edit directly. Autogenerated at release. - CHANGELOG: Use the printchanges target to see the curent changes. - CHANGELOG: Use the insertchanges target to create the final log. + * linux-raspi2: 4.13.0-1014.15 -proposed tracker (LP: #1750057) - -- Khalid Elmously Fri, 16 Feb 2018 16:16:23 -0500 + + [ Ubuntu: 4.13.0-36.40 ] + + * linux: 4.13.0-36.40 -proposed tracker (LP: #1750010) + * Rebuild without "CVE-2017-5754 ARM64 KPTI fixes" patch set + + -- Khalid Elmously Fri, 16 Feb 2018 17:21:33 -0500 linux-raspi2 (4.13.0-1013.14) artful; urgency=medium diff --git a/debian.raspi2/config/arm64/config.common.arm64 b/debian.raspi2/config/arm64/config.common.arm64 index 99d59a8fffb6..b9b73dca3e7d 100644 --- a/debian.raspi2/config/arm64/config.common.arm64 +++ b/debian.raspi2/config/arm64/config.common.arm64 @@ -11,7 +11,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y # CONFIG_BCM_VC_SM is not set -CONFIG_HAVE_ARCH_VMAP_STACK=y # CONFIG_IRQ_POLL is not set CONFIG_LIBIO=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 diff --git a/debian.raspi2/config/armhf/config.common.armhf b/debian.raspi2/config/armhf/config.common.armhf index 5db52349e9b5..c4d9692784c9 100644 --- a/debian.raspi2/config/armhf/config.common.armhf +++ b/debian.raspi2/config/armhf/config.common.armhf @@ -11,7 +11,6 @@ CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set CONFIG_BCM_VC_SM=y -# CONFIG_HAVE_ARCH_VMAP_STACK is not set CONFIG_IRQ_POLL=y # CONFIG_LIBIO is not set CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu index 0cbeb593d8ba..26f09a460b3b 100644 --- a/debian.raspi2/config/config.common.ubuntu +++ b/debian.raspi2/config/config.common.ubuntu @@ -192,13 +192,11 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_HAS_KCOV=y -CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_HEADER=y @@ -305,7 +303,6 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y CONFIG_ARM64_MODULE_PLTS=y CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_PAN=y -CONFIG_ARM64_PMEM=y CONFIG_ARM64_PTDUMP_CORE=y # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set @@ -2047,7 +2044,6 @@ CONFIG_HAMRADIO=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set -CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -2068,6 +2064,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +# CONFIG_HAVE_ARCH_VMAP_STACK is not set CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_SMCCC=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set @@ -5930,7 +5927,6 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX_DIAG=m -CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UPROBES=y CONFIG_UPROBE_EVENTS=y @@ -6371,7 +6367,6 @@ CONFIG_VL6180=m CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y -CONFIG_VMAP_STACK=y # CONFIG_VMSPLIT_1G is not set CONFIG_VMSPLIT_2G=y # CONFIG_VMSPLIT_3G is not set -- 2.39.5