[linux] 01/01: [amd64] Re-enable LEGACY_VSYSCALL_EMULATE instead of LEGACY_VSYSCALL_NONE

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 33f253b15d3ab1c0df70109d35fee56c8bf25a99
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Dec 9 13:27:04 2016 +0000

    [amd64] Re-enable LEGACY_VSYSCALL_EMULATE instead of LEGACY_VSYSCALL_NONE
    
    There are still binaries in stable that use vsyscall (via dietlibc).
    Since dietlibc is statically linked and some of the packages are also
    backported from unstable, we can't use versioned Breaks to force
    upgrades.
---
 debian/changelog           | 4 ++++
 debian/config/amd64/config | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fba74d..38fdcaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,10 @@ linux (4.8.12-1) UNRELEASED; urgency=medium
   * net: avoid signed overflows for SO_{SND|RCV}BUFFORCE (CVE-2016-9793)
   * Add ABI reference for 4.8.0-2
 
+  [ Ben Hutchings ]
+  * [amd64] Re-enable LEGACY_VSYSCALL_EMULATE instead of LEGACY_VSYSCALL_NONE.
+    There are still binaries in stable that use vsyscall (via dietlibc).
+
  -- Uwe Kleine-König <ukleinek at debian.org>  Sun, 04 Dec 2016 21:16:06 +0100
 
 linux (4.8.11-1) unstable; urgency=medium
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 0688215..dfd7190 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -20,8 +20,8 @@ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_RANDOMIZE_MEMORY=y
 ## choice: vsyscall table for legacy applications
 # CONFIG_LEGACY_VSYSCALL_NATIVE is not set
-# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
-CONFIG_LEGACY_VSYSCALL_NONE=y
+CONFIG_LEGACY_VSYSCALL_EMULATE=y
+# CONFIG_LEGACY_VSYSCALL_NONE is not set
 ## end choice
 CONFIG_PCI_MMCONFIG=y
 CONFIG_ISA_DMA_API=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git