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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/route.c between commit bb3c36863e80 ("ipv6: Check dest prefix
length on original route not copied one in rt6_alloc_cow()") from the net
tree and commit 3830847396fa ("ipv6: Various cleanups in route.c") from
the net-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/ipv6/route.c
index b582a0a,4bf362b..0000000
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -727,11 -727,11 +727,11 @@@ static struct rt6_info *rt6_alloc_cow(c
  		struct neighbour *neigh;
  		int attempts = !in_softirq();
  
- 		if (!(rt->rt6i_flags&RTF_GATEWAY)) {
+ 		if (!(rt->rt6i_flags & RTF_GATEWAY)) {
 -			if (rt->rt6i_dst.plen != 128 &&
 +			if (ort->rt6i_dst.plen != 128 &&
  			    ipv6_addr_equal(&ort->rt6i_dst.addr, daddr))
  				rt->rt6i_flags |= RTF_ANYCAST;
- 			ipv6_addr_copy(&rt->rt6i_gateway, daddr);
+ 			rt->rt6i_gateway = *daddr;
  		}
  
  		rt->rt6i_flags |= RTF_CACHE;

Attachment: pgp00000.pgp
Description: PGP signature