From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54173 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161228AbcFQPg3 (ORCPT ); Fri, 17 Jun 2016 11:36:29 -0400 Subject: Patch "uapi glibc compat: fix compilation when !__USE_MISC in glibc" has been added to the 4.6-stable tree 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: , From: Date: Fri, 17 Jun 2016 08:36:27 -0700 Message-ID: <1466177787202254@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From foo@baz Fri Jun 17 08:34:39 PDT 2016 From: Nicolas Dichtel Date: Thu, 19 May 2016 17:26:29 +0200 Subject: uapi glibc compat: fix compilation when !__USE_MISC in glibc From: Nicolas Dichtel [ 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 CC: Josh Boyer CC: Stephen Hemminger CC: Waldemar Brodkorb CC: Gabriel Laskar CC: Mikko Rapeli Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h") Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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