Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 23 Nov 2011 11:17:51 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv4/inet_diag.c between commit 717b6d836646 ("net-netlink: fix diag
to export IPv4 tos for dual-stack IPv6 sockets") from the net tree and
commit 4e3fd7a06dc2 ("net: remove ipv6_addr_copy()") from the net-next
tree.

Just context changes.  I fixed it up (see below) can can carry the fix as
necessary,
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc net/ipv4/inet_diag.c
index ccee270,bbebdec..0000000
--- a/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