This is a note to let you know that I've just added the patch titled
uapi glibc compat: fix compilation when !__USE_MISC in glibc
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
uapi-glibc-compat-fix-compilation-when-__use_misc-in-glibc.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Fri Jun 17 11:18:18 PDT 2016
From: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Date: Thu, 19 May 2016 17:26:29 +0200
Subject: uapi glibc compat: fix compilation when !__USE_MISC in glibc
From: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
[ Upstream commit f0a3fdca794d1e68ae284ef4caefe681f7c18e89 ]
These structures are defined only if __USE_MISC is set in glibc net/if.h
headers, ie when _BSD_SOURCE or _SVID_SOURCE are defined.
CC: Jan Engelhardt <jengelh@xxxxxxx>
CC: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx>
CC: Stephen Hemminger <shemming@xxxxxxxxxxx>
CC: Waldemar Brodkorb <mail@xxxxxxxxxxxxxxxxxxxx>
CC: Gabriel Laskar <gabriel@xxxxxxxxxxxx>
CC: Mikko Rapeli <mikko.rapeli@xxxxxx>
Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/uapi/linux/libc-compat.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -52,7 +52,7 @@
#if defined(__GLIBC__)
/* Coordinate with glibc net/if.h header. */
-#if defined(_NET_IF_H)
+#if defined(_NET_IF_H) && defined(__USE_MISC)
/* GLIBC headers included first so don't define anything
* that would already be defined. */
Patches currently in stable-queue which might be from nicolas.dichtel@xxxxxxxxx are
queue-4.4/uapi-glibc-compat-fix-compilation-when-__use_misc-in-glibc.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html