[linux] 01/01: Merge tag 'debian/4.8.15-2'
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Jan 5 00:01:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit 97ab9059a98bad2189b15314e54504fc7e552a06
Merge: 61b7146 b977a70
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Thu Jan 5 00:01:00 2017 +0000
Merge tag 'debian/4.8.15-2'
debian/changelog | 37 ++++++++++++
debian/config/amd64/config | 9 +++
debian/config/armel/config.marvell | 5 ++
debian/config/config | 60 +++++++++++++++++++
debian/config/featureset-rt/config | 1 +
debian/config/kernelarch-x86/config | 17 ++++++
...low-L1-to-intercept-software-exceptions-B.patch | 65 ++++++++++++++++++++
...g_write-is-not-fit-to-be-called-under-KER.patch | 48 +++++++++++++++
...t-request-no-dynamic-linker-for-boot-wrap.patch | 69 ++++++++++++++++++++++
debian/patches/series | 3 +
debian/templates/control.source.in | 4 +-
11 files changed, 316 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index 1c75baf,8d94808..a553289
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,97 -1,40 +1,134 @@@
+linux (4.9-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release: https://kernelnewbies.org/Linux_4.9
+ - Revert "default exported asm symbols to zero"
+
+ [ Ben Hutchings ]
+ * Set ABI to trunk
+
+ [ Uwe Kleine-König ]
+ * enable `perf data' support; patch by Sebastian Andrzej Siewior
+ (Closes: #846597)
+ * [rt] Update to 4.9-rt1 and reenable
+
+ -- Uwe Kleine-König <ukleinek at debian.org> Sun, 18 Dec 2016 17:53:39 +0100
+
+linux (4.9~rc8-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * radeon: Update package name in error message for missing firmware
+ * [amd64] Remove xen-linux-system-<version> package
+ * debian/control: Fix build-dependency on flex to work with new versions
+ that have M-A: allowed
+ * Revert "default exported asm symbols to zero"
+ * [arm64] remoteproc: Disable QCOM_WCNSS_PIL (fixes FTBFS)
+ * [sparc64] Don't re-add exports of string functions that are now only
+ defined as macros (fixes FTBFS, after other fixes)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 05 Dec 2016 05:02:30 +0000
+
+linux (4.9~rc7-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate:
+ - [armhf,armel] Revert "arm: move exports to definitions" (Closes: #844530)
+
+ [ Martin Michlmayr ]
+ * [arm64] Enable more QCOM options: BT_QCOMSMD, QCOM_EBI2, QCOM_TSENS,
+ QCOM_WCNSS_PIL and EXTCON_QCOM_SPMI_MISC.
+ * [arm64] Enable ARCH_MVEBU and related options.
+
+ [ Ben Hutchings ]
+ * linux-headers-common: Make these packages architecture-independent by
+ including headers for all architectures that we build a kernel for
+ * Fix exported symbol versions:
+ - Revert upstream changes moving exports to assembly sources
+ - [x86] kbuild: enable modversions for symbols exported from assembly
+ - [powerpc] Remove Mac-on-Linux hooks
+ - [powerpc*] Fix missing CRCs, add yet more asm-prototypes.h declarations
+ - Re-enable CONFIG_MODVERSIONS in a slightly weaker form
+ - module: Disable matching missing version CRC
+ * debian/bin/buildcheck.py: Add check for symbols with version CRC of 0
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 03 Dec 2016 01:46:12 +0000
+
+linux (4.9~rc5-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Aurelien Jarno ]
+ * Enable MAC802154, IEEE802154_ADF7242, IEEE802154_AT86RF230,
+ IEEE802154_ATUSB, IEEE802154_CC2520 and IEEE802154_MRF24J40.
+ * [arm64] Enable VIRTUALIZATION and KVM.
+
+ [ Ben Hutchings ]
+ * [hppa] Update build-dependencies for 64-bit kernel (fixes FTBFS)
+ * linux-perf: Exclude perf-read-vdso* from shared library dependency
+ check (fixes FTBFS on sparc64)
+ * [x86] kexec: add -fno-PIE
+ * wireless: Enable RTL8XXXU as module, replacement for R8723AU
+ * netfilter: Enable NFT_SET_RBTREE and NFT_SET_HASH as modules,
+ renamed from NFT_RBTREE and NFT_HASH
+ * tcp: Enable TCP_CONG_BBR as module
+ * [armel] Drop versatile flavour, which has been broken since version
+ 4.5~rc4-1~exp1
+ * [x86] ethernet: Enable ENA_ETHERNET as module
+ * [x86] efi: Prevent mixed mode boot corruption with CONFIG_VMAP_STACK=y
+ * w1: Disable W1_MASTER_MATROX
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 14 Nov 2016 05:19:31 +0000
+
+linux (4.9~rc3-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * [rt] Disable until it is updated for 4.9 or later
+ * kbuild: add -fno-PIE (Closes: #841368)
+ * Compile with gcc-6 on all architectures
+ * debian/control: Fix build-dependency on openssl to work with new
+ versions that have M-A: allowed (Closes: #839145)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 03 Nov 2016 16:51:55 -0600
+
+ linux (4.8.15-2) unstable; urgency=medium
+
+ [ Ben Hutchings ]
+ * [x86] Enable INTEL_VBTN as module (Closes: #848967)
+ * debian/control: Change build-dependency on asciidoc to prefer the new
+ asciidoc-base, so we don't pull in LaTeX unnecessarily
+ * [x86] Enable LEDS_DELL_NETBOOKS and DELL_SMBIOS as modules; re-enable
+ DELL_LAPTOP and DELL_WMI as modules (Closes: #849674)
+ * [powerpc*] boot: Request no dynamic linker for boot wrapper
+ (Closes: #848851, FTBFS on ppc6el)
+ * cpufreq: Enable CPU_FREQ_GOV_SCHEDUTIL as module
+ * [x86] ACPI: Enable DPTF_POWER as module
+ * [x86] perf: Enable PERF_EVENTS_AMD_POWER as module
+ * [x86] perf: Change PERF_EVENTS_INTEL_{CSTATE,RAPL,UNCORE} from built-in
+ to modules
+ * PCI: Enable PCIE_DPC (except for armel/versatile)
+ * [amd64] PCI: Enable PCI_HYPERV as module
+ * inet: Enable INET_DIAG_DESTROY
+ * tcp: Enable TCP_CONG_NV as module
+ * ipv6: Enable IPV6_ILA as module
+ * net/sched: Enable NET_CLS_MATCHALL, NET_ACT_IFE, NET_IFE_SKBMARK,
+ NET_IFE_SKBPRIO as modules
+ * hci_uart: Enable BT_HCIUART_AG6XX
+ * nvme: Enable NVME_RDMA, NVME_TARGET, NVME_TARGET_RDMA as modules
+ * [amd64] mic: Enable VOP_BUS and VOP as modules; re-enable INTEL_MIC_HOST as
+ module
+ * debian/control: Add Salvatore Bonaccorso to Uploaders
+ * [rt] Update to 4.8.15-rt10 (no functional change)
+
+ [ Salvatore Bonaccorso ]
+ * sg_write()/bsg_write() is not fit to be called under KERNEL_DS
+ (CVE-2016-10088)
+ * kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)
+ (CVE-2016-9588)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 04 Jan 2017 19:39:36 +0000
+
linux (4.8.15-1) unstable; urgency=medium
* New upstream stable update:
diff --cc debian/patches/bugfix/powerpc/powerpc-boot-request-no-dynamic-linker-for-boot-wrap.patch
index 0000000,22fff5b..0a01abf
mode 000000,100644..100644
--- a/debian/patches/bugfix/powerpc/powerpc-boot-request-no-dynamic-linker-for-boot-wrap.patch
+++ b/debian/patches/bugfix/powerpc/powerpc-boot-request-no-dynamic-linker-for-boot-wrap.patch
@@@ -1,0 -1,70 +1,69 @@@
+ From: Nicholas Piggin <npiggin at gmail.com>
+ Date: Mon, 28 Nov 2016 12:42:26 +1100
+ Subject: powerpc/boot: Request no dynamic linker for boot wrapper
+ Origin: https://git.kernel.org/linus/ff45000fcb56b5b0f1a14a865d3541746d838a0a
+ Bug-Debian: https://bugs.debian.org/848851
+
+ The boot wrapper performs its own relocations and does not require
+ PT_INTERP segment. However currently we don't tell the linker that.
+
+ Prior to binutils 2.28 that works OK. But since binutils commit
+ 1a9ccd70f9a7 ("Fix the linker so that it will not silently generate ELF
+ binaries with invalid program headers. Fix readelf to report such
+ invalid binaries.") binutils tries to create a program header segment
+ due to PT_INTERP, and the link fails because there is no space for it:
+
+ ld: arch/powerpc/boot/zImage.pseries: Not enough room for program headers, try linking with -N
+ ld: final link failed: Bad value
+
+ So tell the linker not to do that, by passing --no-dynamic-linker.
+
+ Cc: stable at vger.kernel.org
+ Reported-by: Anton Blanchard <anton at samba.org>
+ Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
+ [mpe: Drop dependency on ld-version.sh and massage change log]
+ Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
-[bwh: Backported to 4.8: adjust context]
+ ---
+ arch/powerpc/boot/wrapper | 24 +++++++++++++++++++++++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+ --- a/arch/powerpc/boot/wrapper
+ +++ b/arch/powerpc/boot/wrapper
-@@ -161,6 +161,28 @@ case "$elfformat" in
++@@ -181,6 +181,28 @@ case "$elfformat" in
+ elf32-powerpc) format=elf32ppc ;;
+ esac
+
+ +ld_version()
+ +{
+ + # Poached from scripts/ld-version.sh, but we don't want to call that because
+ + # this script (wrapper) is distributed separately from the kernel source.
+ + # Extract linker version number from stdin and turn into single number.
+ + awk '{
+ + gsub(".*\\)", "");
+ + gsub(".*version ", "");
+ + gsub("-.*", "");
+ + split($1,a, ".");
+ + print a[1]*100000000 + a[2]*1000000 + a[3]*10000;
+ + exit
+ + }'
+ +}
+ +
+ +# Do not include PT_INTERP segment when linking pie. Non-pie linking
+ +# just ignores this option.
+ +LD_VERSION=$(${CROSS}ld --version | ld_version)
+ +LD_NO_DL_MIN_VERSION=$(echo 2.26 | ld_version)
+ +if [ "$LD_VERSION" -ge "$LD_NO_DL_MIN_VERSION" ] ; then
+ + nodl="--no-dynamic-linker"
+ +fi
+
+ platformo=$object/"$platform".o
+ lds=$object/zImage.lds
-@@ -417,7 +439,7 @@ if [ "$platform" != "miboot" ]; then
- if [ -n "$link_address" ] ; then
++@@ -446,7 +468,7 @@ if [ "$platform" != "miboot" ]; then
+ text_start="-Ttext $link_address"
+ fi
++ #link everything
+ - ${CROSS}ld -m $format -T $lds $text_start $pie -o "$ofile" \
+ + ${CROSS}ld -m $format -T $lds $text_start $pie $nodl -o "$ofile" \
+ $platformo $tmp $object/wrapper.a
+ rm $tmp
+ fi
diff --cc debian/patches/series
index db7baac,e4547f2..1970670
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -94,17 -96,17 +95,19 @@@ features/all/securelevel/arm64-add-kern
# Security fixes
bugfix/all/ptrace-being-capable-wrt-a-process-requires-mapped-uids-gids.patch
debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
-bugfix/all/xfs-Propagate-dentry-down-to-inode_change_ok.patch
-bugfix/all/ceph-Propagate-dentry-down-to-inode_change_ok.patch
-bugfix/all/fuse-Propagate-dentry-down-to-inode_change_ok.patch
-bugfix/all/fs-Give-dentry-to-inode_change_ok-instead-of-inode.patch
-bugfix/all/fs-Avoid-premature-clearing-of-capabilities.patch
-bugfix/all/vfio-pci-Fix-integer-overflows-bitmask-check.patch
-bugfix/all/mnt-Add-a-per-mount-namespace-limit-on-the-number-of.patch
-bugfix/all/net-handle-no-dst-on-skb-in-icmp6_send.patch
-bugfix/all/netfilter-ipv6-nf_defrag-drop-mangled-skb-on-ream-er.patch
+
+# Fix exported symbol versions
+bugfix/ia64/revert-ia64-move-exports-to-definitions.patch
+bugfix/sparc/revert-sparc-move-exports-to-definitions.patch
+bugfix/s390/revert-s390-move-exports-to-definitions.patch
+bugfix/m68k/revert-m68k-move-exports-to-definitions.patch
+bugfix/alpha/revert-alpha-move-exports-to-actual-definitions.patch
+bugfix/x86/x86-kbuild-enable-modversions-for-symbols-exported-f.patch
+bugfix/powerpc/powerpc-remove-mac-on-linux-hooks.patch
+bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
+bugfix/all/module-disable-matching-missing-version-crc.patch
+ bugfix/all/sg_write-bsg_write-is-not-fit-to-be-called-under-KER.patch
+ bugfix/all/kvm-nVMX-Allow-L1-to-intercept-software-exceptions-B.patch
# ABI maintenance
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list