Merge branch 'master' into next

Conflicts:
	include/uapi/linux/snmp.h

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --cc include/libnetlink.h
Simple merge

diff --cc include/uapi/linux/bpf.h
Simple merge

diff --cc include/uapi/linux/snmp.h
index 74904e9d1b726f5089bdfb2f6d1280fa991a27a7,fd42c1316d3d112ecd8a00d2b499d6f6901c5e81..549a31c29f7d4ebbc3a861244e9757c3ebbc2d0d
--- 1/include/uapi/linux/snmp.h
--- 2/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@@ -283,7 -283,7 +283,8 @@@ enu
        LINUX_MIB_TCPACKCOMPRESSED,             /* TCPAckCompressed */
        LINUX_MIB_TCPZEROWINDOWDROP,            /* TCPZeroWindowDrop */
        LINUX_MIB_TCPRCVQDROP,                  /* TCPRcvQDrop */
+       LINUX_MIB_TCPWQUEUETOOBIG,              /* TCPWqueueTooBig */
 +      LINUX_MIB_TCPFASTOPENPASSIVEALTKEY,     /* TCPFastOpenPassiveAltKey */
        __LINUX_MIB_MAX
  };
  

diff --cc include/utils.h
Simple merge

diff --cc ip/ip.c
Simple merge

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/ipmroute.c
Simple merge

diff --cc ip/ipnetns.c
Simple merge

diff --cc ip/ipvrf.c
Simple merge

diff --cc lib/libnetlink.c
Simple merge