[linux] 01/04: ptrace: Fix ABI change for priv-esc fix

[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 e148000b24ff281ff687ae12f89a70c5590a54ea
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 2 16:27:28 2016 +0000

    ptrace: Fix ABI change for priv-esc fix
---
 .../ptrace-fix-abi-change-for-priv-esc-fix.patch      | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/debian/ptrace-fix-abi-change-for-priv-esc-fix.patch b/debian/patches/debian/ptrace-fix-abi-change-for-priv-esc-fix.patch
new file mode 100644
index 0000000..1243c3e
--- /dev/null
+++ b/debian/patches/debian/ptrace-fix-abi-change-for-priv-esc-fix.patch
@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 27 Dec 2015 21:11:09 +0000
+Subject: ptrace: Fix ABI change for priv-esc fix
+Forwarded: not-needed
+
+Hide the new #include from genksyms.
+---
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -20,7 +20,9 @@
+ #include <linux/uio.h>
+ #include <linux/audit.h>
+ #include <linux/pid_namespace.h>
++#ifndef __GENKSYMS__
+ #include <linux/user_namespace.h>
++#endif
+ #include <linux/syscalls.h>
+ #include <linux/uaccess.h>
+ #include <linux/regset.h>
diff --git a/debian/patches/series b/debian/patches/series
index e041bde..b504771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -126,6 +126,7 @@ bugfix/all/xen-pciback-do-not-install-an-irq-handler-for-msi-in.patch
 bugfix/all/xen-pciback-for-xen_pci_op_disable_msi-x-only-disabl.patch
 bugfix/all/xen-pciback-don-t-allow-msi-x-ops-if-pci_command_mem.patch
 bugfix/all/ptrace-being-capable-wrt-a-process-requires-mapped-uids-gids.patch
+debian/ptrace-fix-abi-change-for-priv-esc-fix.patch
 bugfix/all/keys-fix-race-between-read-and-revoke.patch
 bugfix/x86/KVM-x86-Reload-pit-counters-for-all-channels-when-re.patch
 bugfix/all/drm-nouveau-pmu-do-not-assume-a-pmu-is-present.patch

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