Merge branch 'master' into net-next

Conflicts:
	include/linux/tcp.h
	lib/libnetlink.c

diff --cc genl/ctrl.c
Simple merge

diff --cc include/libnetlink.h
Simple merge

diff --cc include/linux/tcp.h
index 8b17cff161c908b74b5b1d5a86e2e2c0ddfc9d69,1e002563be7267fec1afca1d311d27fc62c8f5a9..1e9b4a627eff3e9c230f87088f803830531177a9
--- 1/include/linux/tcp.h
--- 2/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@@ -192,8 -190,8 +192,10 @@@ struct tcp_info 
  
        __u64   tcpi_pacing_rate;
        __u64   tcpi_max_pacing_rate;
--      __u64   tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
++      __u64   tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
        __u64   tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
++      __u32   tcpi_segs_out;       /* RFC4898 tcpEStatsPerfSegsOut */
++      __u32   tcpi_segs_in;        /* RFC4898 tcpEStatsPerfSegsIn */
  };
  
  /* for TCP_MD5SIG socket option */

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/iplink.c
Simple merge

diff --cc ip/ipnetns.c
Simple merge

diff --cc ip/iproute.c
Simple merge

diff --cc lib/libnetlink.c
index 424a5b6ffe8f02ce125ffcdab5825529781e3e24,901236e62a9fd9aff47484e5fed5a49b4cfe0a08..46cac34c7581e45c038a3e37d71f2eeb8dd962b7
--- 1/lib/libnetlink.c
--- 2/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@@ -25,10 -25,10 +25,14 @@@
  
  #include "libnetlink.h"
  
 +#ifndef SOL_NETLINK
 +#define SOL_NETLINK 270
 +#endif
 +
+ #ifndef MIN
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+ #endif
+ 
  int rcvbuf = 1024 * 1024;
  
  void rtnl_close(struct rtnl_handle *rth)