[linux] 01/01: Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" (Closes: #844491)

[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 96f3d8b5c37d477099ab44b0c5b143b0b9f9c484
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Nov 16 21:18:15 2016 +0000

    Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" (Closes: #844491)
---
 debian/changelog                                   |  4 ++
 ...ude-uapi-linux-atm_zatm.h-include-linux-t.patch | 57 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 62 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c31471d..ebc4748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,10 @@ linux (4.8.8-1) UNRELEASED; urgency=medium
   * fs: Avoid premature clearing of capabilities (CVE-2015-1350)
     (Closes: #770492)
 
+  [ Ben Hutchings ]
+  * Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"
+    (Closes: #844491)
+
  -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 15 Nov 2016 22:01:08 +0100
 
 linux (4.8.7-1) unstable; urgency=medium
diff --git a/debian/patches/bugfix/all/revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch b/debian/patches/bugfix/all/revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch
new file mode 100644
index 0000000..afb4bc2
--- /dev/null
+++ b/debian/patches/bugfix/all/revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch
@@ -0,0 +1,57 @@
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Thu, 10 Nov 2016 19:08:39 -0500
+Subject: Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: https://git.kernel.org/linus/7b5b74efcca00f15c2aec1dc7175bfe34b6ec643
+Bug-Debian: https://bugs.debian.org/844491
+
+This reverts commit cf00713a655d ("include/uapi/linux/atm_zatm.h: include
+linux/time.h").
+
+This attempted to fix userspace breakage that no longer existed when
+the patch was merged.  Almost one year earlier, commit 70ba07b675b5
+("atm: remove 'struct zatm_t_hist'") deleted the struct in question.
+
+After this patch was merged, we now have to deal with people being
+unable to include this header in conjunction with standard C library
+headers like stdlib.h (which linux-atm does).  Example breakage:
+x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I./../q2931 -I./../saal \
+	-I.  -DCPPFLAGS_TEST  -I../../src/include -O2 -march=native -pipe -g \
+	-frecord-gcc-switches -freport-bug -Wimplicit-function-declaration \
+	-Wnonnull -Wstrict-aliasing -Wparentheses -Warray-bounds \
+	-Wfree-nonheap-object -Wreturn-local-addr -fno-strict-aliasing -Wall \
+	-Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -c zntune.c
+In file included from /usr/include/linux/atm_zatm.h:17:0,
+                 from zntune.c:17:
+/usr/include/linux/time.h:9:8: error: redefinition of ‘struct timespec’
+ struct timespec {
+        ^
+In file included from /usr/include/sys/select.h:43:0,
+                 from /usr/include/sys/types.h:219,
+                 from /usr/include/stdlib.h:314,
+                 from zntune.c:9:
+/usr/include/time.h:120:8: note: originally defined here
+ struct timespec
+        ^
+
+Signed-off-by: Mike Frysinger <vapier at gentoo.org>
+Acked-by: Mikko Rapeli <mikko.rapeli at iki.fi>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ include/uapi/linux/atm_zatm.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h
+index 5cd4d4d2dd1d..9c9c6ad55f14 100644
+--- a/include/uapi/linux/atm_zatm.h
++++ b/include/uapi/linux/atm_zatm.h
+@@ -14,7 +14,6 @@
+ 
+ #include <linux/atmapi.h>
+ #include <linux/atmioc.h>
+-#include <linux/time.h>
+ 
+ #define ZATM_GETPOOL	_IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
+ 						/* get pool statistics */
diff --git a/debian/patches/series b/debian/patches/series
index 2e51238..8b1178e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,6 +63,7 @@ bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
 bugfix/all/ext4-fix-bug-838544.patch
 bugfix/all/mm-memcontrol-use-special-workqueue-for-creating-per-memcg-caches.patch
+bugfix/all/revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch
 
 # Miscellaneous features
 

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