History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Overlapping header include additions in macsec.c A bug fix in 'net' overlapping with the removal of 'version' string in ena_netdev.c Overlapping test additions in selftests Makefile Overlapping PCI ID table adjustments in iwlwifi driver.

David S. Miller committed 6 years ago

Commit 9fb16952 parents 1f074e6 1b649e0416 files · +4242 −1919Browse files

Showing the changes to tools/include/uapi (2 of 416 files). Show all

Unified · Split

2 files
  1. tools/include/uapi/asm/errno.h +7 −7
  2. tools/include/uapi/linux/in.h +2 −0
tools/include/uapi/asm/errno.h+7−7
@@ -1,18 +1,18 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 */
2#if defined(__i386__) || defined(__x86_64__)2#if defined(__i386__) || defined(__x86_64__)
3#include "../../arch/x86/include/uapi/asm/errno.h"3#include "../../../arch/x86/include/uapi/asm/errno.h"
4#elif defined(__powerpc__)4#elif defined(__powerpc__)
5#include "../../arch/powerpc/include/uapi/asm/errno.h"5#include "../../../arch/powerpc/include/uapi/asm/errno.h"
6#elif defined(__sparc__)6#elif defined(__sparc__)
7#include "../../arch/sparc/include/uapi/asm/errno.h"7#include "../../../arch/sparc/include/uapi/asm/errno.h"
8#elif defined(__alpha__)8#elif defined(__alpha__)
9#include "../../arch/alpha/include/uapi/asm/errno.h"9#include "../../../arch/alpha/include/uapi/asm/errno.h"
10#elif defined(__mips__)10#elif defined(__mips__)
11#include "../../arch/mips/include/uapi/asm/errno.h"11#include "../../../arch/mips/include/uapi/asm/errno.h"
12#elif defined(__ia64__)12#elif defined(__ia64__)
13#include "../../arch/ia64/include/uapi/asm/errno.h"13#include "../../../arch/ia64/include/uapi/asm/errno.h"
14#elif defined(__xtensa__)14#elif defined(__xtensa__)
15#include "../../arch/xtensa/include/uapi/asm/errno.h"15#include "../../../arch/xtensa/include/uapi/asm/errno.h"
16#else16#else
17#include <asm-generic/errno.h>17#include <asm-generic/errno.h>
18#endif18#endif
tools/include/uapi/linux/in.h+2−0
@@ -74,6 +74,8 @@ enum { · 73 unmodified lines
74#define IPPROTO_UDPLITE IPPROTO_UDPLITE74#define IPPROTO_UDPLITE IPPROTO_UDPLITE
75 IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */75 IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */
76#define IPPROTO_MPLS IPPROTO_MPLS76#define IPPROTO_MPLS IPPROTO_MPLS
77 IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */
78#define IPPROTO_ETHERNET IPPROTO_ETHERNET
77 IPPROTO_RAW = 255, /* Raw IP packets */79 IPPROTO_RAW = 255, /* Raw IP packets */
78#define IPPROTO_RAW IPPROTO_RAW80#define IPPROTO_RAW IPPROTO_RAW
79 IPPROTO_MPTCP = 262, /* Multipath TCP connection */81 IPPROTO_MPTCP = 262, /* Multipath TCP connection */