[linux] 01/02: bridge: Fix ABI change in 4.6.4

[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 bd2f2b2ea482a8a41c2d54c3b5420d0d822cec62
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jul 14 00:33:12 2016 +0100

    bridge: Fix ABI change in 4.6.4
---
 debian/changelog                                   |  3 +++
 .../debian/bridge-fix-abi-change-in-4.6.4.patch    | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 405b65b..ad8951e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ linux (4.6.4-1) UNRELEASED; urgency=medium
   * apparmor: fix oops, validate buffer size in apparmor_setprocattr()
     (CVE-2016-6187)
 
+  [ Ben Hutchings ]
+  * bridge: Fix ABI change in 4.6.4
+
  -- Uwe Kleine-König <ukleinek at debian.org>  Sun, 10 Jul 2016 15:25:48 +0200
 
 linux (4.6.3-1) unstable; urgency=medium
diff --git a/debian/patches/debian/bridge-fix-abi-change-in-4.6.4.patch b/debian/patches/debian/bridge-fix-abi-change-in-4.6.4.patch
new file mode 100644
index 0000000..0b53278
--- /dev/null
+++ b/debian/patches/debian/bridge-fix-abi-change-in-4.6.4.patch
@@ -0,0 +1,24 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 14 Jul 2016 00:30:57 +0100
+Subject: bridge: Fix ABI change in 4.6.4
+Forwarded: not-needed
+
+Although this structure is private, it affects the symbol version for
+br_deliver() which is called from a netfilter module
+
+Hide the new bitfield from genksyms.
+
+---
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -304,7 +304,10 @@ struct net_bridge
+ 	u8				multicast_disabled:1;
+ 	u8				multicast_querier:1;
+ 	u8				multicast_query_use_ifaddr:1;
++#ifndef __GENKSYMS__
+ 	u8				has_ipv6_addr:1;
++	/* 4 bits padding */
++#endif
+ 
+ 	u32				hash_elasticity;
+ 	u32				hash_max;
diff --git a/debian/patches/series b/debian/patches/series
index c6c2330..5cf6b0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -119,6 +119,7 @@ bugfix/all/apparmor-fix-oops-validate-buffer-size-in-apparmor_s.patch
 # ABI maintenance
 debian/mips-siginfo-fix-abi-change-in-4.6.2.patch
 debian/mips-libgcc-fix-abi-change-in-4.6.2.patch
+debian/bridge-fix-abi-change-in-4.6.4.patch
 
 # Tools bug fixes
 bugfix/all/usbip-document-tcp-wrappers.patch

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