Merge 4.8-rc5 into staging-next

We want the staging fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 26 insertions, 0 deletions

diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index e4f048ee7043..44b8a6bd5fe1 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -139,6 +139,25 @@
 
 #endif /* _NETINET_IN_H */
 
+/* Coordinate with glibc netipx/ipx.h header. */
+#if defined(__NETIPX_IPX_H)
+
+#define __UAPI_DEF_SOCKADDR_IPX                 0
+#define __UAPI_DEF_IPX_ROUTE_DEFINITION         0
+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION     0
+#define __UAPI_DEF_IPX_CONFIG_DATA              0
+#define __UAPI_DEF_IPX_ROUTE_DEF                0
+
+#else /* defined(__NETIPX_IPX_H) */
+
+#define __UAPI_DEF_SOCKADDR_IPX                 1
+#define __UAPI_DEF_IPX_ROUTE_DEFINITION         1
+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION     1
+#define __UAPI_DEF_IPX_CONFIG_DATA              1
+#define __UAPI_DEF_IPX_ROUTE_DEF                1
+
+#endif /* defined(__NETIPX_IPX_H) */
+
 /* Definitions for xattr.h */
 #if defined(_SYS_XATTR_H)
 #define __UAPI_DEF_XATTR                0
@@ -179,6 +198,13 @@
 #define __UAPI_DEF_IN6_PKTINFO          1
 #define __UAPI_DEF_IP6_MTUINFO          1
 
+/* Definitions for ipx.h */
+#define __UAPI_DEF_SOCKADDR_IPX                 1
+#define __UAPI_DEF_IPX_ROUTE_DEFINITION         1
+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION     1
+#define __UAPI_DEF_IPX_CONFIG_DATA              1
+#define __UAPI_DEF_IPX_ROUTE_DEF                1
+
 /* Definitions for xattr.h */
 #define __UAPI_DEF_XATTR                1