Merge branch 'master' into net-next

2017-10-11 10:43:13 -07:00 · 2017-10-11 10:43:13 -07:00 · 92503441cc
parent 60509b997d 596b1c94aa
commit 92503441cc
112 changed files with 1 additions and 3 deletions
--- a/2
+++ b/2
@ -46,7 +46,7 @@ CCOPTS = -O2
 WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
 WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2

-CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
+CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
 YACCFLAGS = -d -t -v

 SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
--- a/include/uapi/linux/atm.h
+++ b/include/uapi/linux/atm.h
--- a/include/uapi/linux/atmapi.h
+++ b/include/uapi/linux/atmapi.h
--- a/include/uapi/linux/atmarp.h
+++ b/include/uapi/linux/atmarp.h
--- a/include/uapi/linux/atmdev.h
+++ b/include/uapi/linux/atmdev.h
--- a/include/uapi/linux/atmioc.h
+++ b/include/uapi/linux/atmioc.h
--- a/include/uapi/linux/atmsap.h
+++ b/include/uapi/linux/atmsap.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/bpf_common.h
+++ b/include/uapi/linux/bpf_common.h
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
--- a/include/uapi/linux/can/vxcan.h
+++ b/include/uapi/linux/can/vxcan.h
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
--- a/include/uapi/linux/filter.h
+++ b/include/uapi/linux/filter.h
--- a/include/uapi/linux/fou.h
+++ b/include/uapi/linux/fou.h
--- a/include/uapi/linux/gen_stats.h
+++ b/include/uapi/linux/gen_stats.h
--- a/include/uapi/linux/genetlink.h
+++ b/include/uapi/linux/genetlink.h
--- a/include/uapi/linux/hdlc/ioctl.h
+++ b/include/uapi/linux/hdlc/ioctl.h
--- a/include/uapi/linux/icmpv6.h
+++ b/include/uapi/linux/icmpv6.h
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
--- a/include/uapi/linux/if_addr.h
+++ b/include/uapi/linux/if_addr.h
--- a/include/uapi/linux/if_addrlabel.h
+++ b/include/uapi/linux/if_addrlabel.h
--- a/include/uapi/linux/if_alg.h
+++ b/include/uapi/linux/if_alg.h
--- a/include/uapi/linux/if_arp.h
+++ b/include/uapi/linux/if_arp.h
--- a/include/uapi/linux/if_bonding.h
+++ b/include/uapi/linux/if_bonding.h
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
--- a/include/uapi/linux/if_macsec.h
+++ b/include/uapi/linux/if_macsec.h
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
--- a/include/uapi/linux/if_tun.h
+++ b/include/uapi/linux/if_tun.h
--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
--- a/include/uapi/linux/if_vlan.h
+++ b/include/uapi/linux/if_vlan.h
--- a/include/uapi/linux/ife.h
+++ b/include/uapi/linux/ife.h
--- a/include/uapi/linux/ila.h
+++ b/include/uapi/linux/ila.h
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
--- a/include/uapi/linux/in6.h
+++ b/include/uapi/linux/in6.h
--- a/include/uapi/linux/in_route.h
+++ b/include/uapi/linux/in_route.h
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
--- a/include/uapi/linux/ip6_tunnel.h
+++ b/include/uapi/linux/ip6_tunnel.h
--- a/include/uapi/linux/ipsec.h
+++ b/include/uapi/linux/ipsec.h
--- a/include/uapi/linux/kernel.h
+++ b/include/uapi/linux/kernel.h
--- a/include/uapi/linux/l2tp.h
+++ b/include/uapi/linux/l2tp.h
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
--- a/include/uapi/linux/limits.h
+++ b/include/uapi/linux/limits.h
--- a/include/uapi/linux/lwtunnel.h
+++ b/include/uapi/linux/lwtunnel.h
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
--- a/include/uapi/linux/mpls.h
+++ b/include/uapi/linux/mpls.h
--- a/include/uapi/linux/mpls_iptunnel.h
+++ b/include/uapi/linux/mpls_iptunnel.h
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
--- a/include/uapi/linux/net_namespace.h
+++ b/include/uapi/linux/net_namespace.h
--- a/include/uapi/linux/netconf.h
+++ b/include/uapi/linux/netconf.h
--- a/include/uapi/linux/netdevice.h
+++ b/include/uapi/linux/netdevice.h
--- a/include/uapi/linux/netfilter.h
+++ b/include/uapi/linux/netfilter.h
--- a/include/uapi/linux/netfilter/ipset/ip_set.h
+++ b/include/uapi/linux/netfilter/ipset/ip_set.h
--- a/include/uapi/linux/netfilter/x_tables.h
+++ b/include/uapi/linux/netfilter/x_tables.h
--- a/include/uapi/linux/netfilter/xt_set.h
+++ b/include/uapi/linux/netfilter/xt_set.h
--- a/include/uapi/linux/netfilter/xt_tcpudp.h
+++ b/include/uapi/linux/netfilter/xt_tcpudp.h
--- a/include/uapi/linux/netfilter_ipv4.h
+++ b/include/uapi/linux/netfilter_ipv4.h
--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
--- a/include/uapi/linux/netfilter_ipv6.h
+++ b/include/uapi/linux/netfilter_ipv6.h
--- a/include/uapi/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
--- a/include/uapi/linux/netlink_diag.h
+++ b/include/uapi/linux/netlink_diag.h
--- a/include/uapi/linux/packet_diag.h
+++ b/include/uapi/linux/packet_diag.h
--- a/include/uapi/linux/param.h
+++ b/include/uapi/linux/param.h
--- a/include/uapi/linux/pfkeyv2.h
+++ b/include/uapi/linux/pfkeyv2.h
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
--- a/include/uapi/linux/posix_types.h
+++ b/include/uapi/linux/posix_types.h
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
--- a/include/uapi/linux/seg6.h
+++ b/include/uapi/linux/seg6.h
--- a/include/uapi/linux/seg6_genl.h
+++ b/include/uapi/linux/seg6_genl.h
--- a/include/uapi/linux/seg6_hmac.h
+++ b/include/uapi/linux/seg6_hmac.h
--- a/include/uapi/linux/seg6_iptunnel.h
+++ b/include/uapi/linux/seg6_iptunnel.h
--- a/include/uapi/linux/seg6_local.h
+++ b/include/uapi/linux/seg6_local.h
--- a/include/uapi/linux/sock_diag.h
+++ b/include/uapi/linux/sock_diag.h
--- a/include/uapi/linux/socket.h
+++ b/include/uapi/linux/socket.h
--- a/include/uapi/linux/sockios.h
+++ b/include/uapi/linux/sockios.h
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
--- a/include/uapi/linux/sysinfo.h
+++ b/include/uapi/linux/sysinfo.h
--- a/include/uapi/linux/tc_act/tc_bpf.h
+++ b/include/uapi/linux/tc_act/tc_bpf.h
--- a/include/uapi/linux/tc_act/tc_connmark.h
+++ b/include/uapi/linux/tc_act/tc_connmark.h
--- a/include/uapi/linux/tc_act/tc_csum.h
+++ b/include/uapi/linux/tc_act/tc_csum.h
--- a/include/uapi/linux/tc_act/tc_defact.h
+++ b/include/uapi/linux/tc_act/tc_defact.h
--- a/include/uapi/linux/tc_act/tc_gact.h
+++ b/include/uapi/linux/tc_act/tc_gact.h
--- a/include/uapi/linux/tc_act/tc_ife.h
+++ b/include/uapi/linux/tc_act/tc_ife.h
--- a/include/uapi/linux/tc_act/tc_ipt.h
+++ b/include/uapi/linux/tc_act/tc_ipt.h
--- a/include/uapi/linux/tc_act/tc_mirred.h
+++ b/include/uapi/linux/tc_act/tc_mirred.h
--- a/include/uapi/linux/tc_act/tc_nat.h
+++ b/include/uapi/linux/tc_act/tc_nat.h
--- a/include/uapi/linux/tc_act/tc_pedit.h
+++ b/include/uapi/linux/tc_act/tc_pedit.h
--- a/include/uapi/linux/tc_act/tc_sample.h
+++ b/include/uapi/linux/tc_act/tc_sample.h
--- a/include/uapi/linux/tc_act/tc_skbedit.h
+++ b/include/uapi/linux/tc_act/tc_skbedit.h
--- a/include/uapi/linux/tc_act/tc_skbmod.h
+++ b/include/uapi/linux/tc_act/tc_skbmod.h
--- a/include/uapi/linux/tc_act/tc_tunnel_key.h
+++ b/include/uapi/linux/tc_act/tc_tunnel_key.h
--- a/include/uapi/linux/tc_act/tc_vlan.h
+++ b/include/uapi/linux/tc_act/tc_vlan.h
--- a/Show More
+++ b/Show More