Merge remote-tracking branch 'net-next/master'

Conflicts:
	net/ipv4/inet_diag.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/igmp.c
Simple merge

diff --cc net/ipv4/inet_diag.c
index ccee270a9b6587efe63e74abcd298bae34fea779,bbebdecd7234adb7ec45d8e1d566c8c9a68cadc6..12efffba6a5eb665351662b427f6ab9e89992e72
--- 1/net/ipv4/inet_diag.c
--- 2/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@@ -132,13 -129,10 +132,11 @@@ static int inet_csk_diag_fill(struct so
        if (r->idiag_family == AF_INET6) {
                const struct ipv6_pinfo *np = inet6_sk(sk);
  
 -              *(struct in6_addr *)r->id.idiag_src = np->rcv_saddr;
 -              *(struct in6_addr *)r->id.idiag_dst = np->daddr;
                if (ext & (1 << (INET_DIAG_TCLASS - 1)))
                        RTA_PUT_U8(skb, INET_DIAG_TCLASS, np->tclass);
-               ipv6_addr_copy((struct in6_addr *)r->id.idiag_src,
-                              &np->rcv_saddr);
-               ipv6_addr_copy((struct in6_addr *)r->id.idiag_dst,
-                              &np->daddr);
 +
++              *(struct in6_addr *)r->id.idiag_src = np->rcv_saddr;
++              *(struct in6_addr *)r->id.idiag_dst = np->daddr;
        }
  #endif
  

diff --cc net/ipv6/inet6_connection_sock.c
Simple merge

diff --cc net/ipv6/ndisc.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/mac80211/status.c
Simple merge