[linux] 02/03: migrate: Fix ABI change

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch jessie-security
in repository linux.

commit 04444bbce6797c194567944bf6cd14c39a14e837
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jun 25 12:46:31 2016 +0200

    migrate: Fix ABI change
---
 debian/changelog                                     |  1 +
 .../debian/migrate-fix-abi-change-in-3.16.36.patch   | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9bbf9ef..cb32697 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ linux (3.16.7-ckt25-2+deb8u1) UNRELEASED; urgency=medium
   * USB: digi_acceleport: do sanity checking for the number of ports
     (CVE-2016-3140)
   * mm: migrate dirty page without clear_page_dirty_for_io etc (CVE-2016-3070)
+  * migrate: Fix ABI change
   * net: fix infoleak in llc (CVE-2016-4485)
   * net: fix infoleak in rtnetlink (CVE-2016-4486)
   * net: fix a kernel infoleak in x25 module (CVE-2016-4580)
diff --git a/debian/patches/debian/migrate-fix-abi-change-in-3.16.36.patch b/debian/patches/debian/migrate-fix-abi-change-in-3.16.36.patch
new file mode 100644
index 0000000..d7b378f
--- /dev/null
+++ b/debian/patches/debian/migrate-fix-abi-change-in-3.16.36.patch
@@ -0,0 +1,20 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+DatE: Sat, 18 Jun 2016 01:35:20 +0100
+Subject: migrate: Fix ABI change in 3.16.36
+Forwarded: not-needed
+
+Hide the new #include from genksyms.
+
+---
+--- a/mm/migrate.c
++++ b/mm/migrate.c
+@@ -30,7 +30,9 @@
+ #include <linux/mempolicy.h>
+ #include <linux/vmalloc.h>
+ #include <linux/security.h>
++#ifndef __GENKSYMS__
+ #include <linux/backing-dev.h>
++#endif
+ #include <linux/memcontrol.h>
+ #include <linux/syscalls.h>
+ #include <linux/hugetlb.h>
diff --git a/debian/patches/series b/debian/patches/series
index dbf0495..6d2e9d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -721,3 +721,4 @@ bugfix/all/netfilter-x_tables-do-compat-validation-via-translat.patch
 bugfix/all/netfilter-x_tables-introduce-and-use-xt_copy_counter.patch
 bugfix/all/posix_acl-Add-set_posix_acl.patch
 bugfix/all/nfsd-check-permissions-when-setting-ACLs.patch
+debian/migrate-fix-abi-change-in-3.16.36.patch

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