From: <gregkh@linuxfoundation.org>
To: nicolas.dichtel@6wind.com, davem@davemloft.net,
gabriel@lse.epita.fr, gregkh@linuxfoundation.org,
jengelh@inai.de, jwboyer@fedoraproject.org,
mail@waldemar-brodkorb.de, mikko.rapeli@iki.fi,
shemming@brocade.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "uapi glibc compat: fix compilation when !__USE_MISC in glibc" has been added to the 4.6-stable tree
Date: Fri, 17 Jun 2016 08:36:27 -0700 [thread overview]
Message-ID: <1466177787202254@kroah.com> (raw)
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.6-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.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From foo@baz Fri Jun 17 08:34:39 PDT 2016
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
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@6wind.com>
[ 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@inai.de>
CC: Josh Boyer <jwboyer@fedoraproject.org>
CC: Stephen Hemminger <shemming@brocade.com>
CC: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
CC: Gabriel Laskar <gabriel@lse.epita.fr>
CC: Mikko Rapeli <mikko.rapeli@iki.fi>
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@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@6wind.com are
queue-4.6/uapi-glibc-compat-fix-compilation-when-__use_misc-in-glibc.patch
reply other threads:[~2016-06-17 15:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466177787202254@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=gabriel@lse.epita.fr \
--cc=jengelh@inai.de \
--cc=jwboyer@fedoraproject.org \
--cc=mail@waldemar-brodkorb.de \
--cc=mikko.rapeli@iki.fi \
--cc=nicolas.dichtel@6wind.com \
--cc=shemming@brocade.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.