Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Sat, 26 Nov 2011 19:47:03 +0000 (14:47 -0500)]
Conflicts:
net/ipv4/inet_diag.c

12 files changed:
1  2 
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
net/core/neighbour.c
net/core/skbuff.c
net/ipv4/igmp.c
net/ipv4/inet_diag.c
net/ipv6/inet6_connection_sock.c
net/ipv6/ndisc.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/mac80211/status.c
net/netlabel/netlabel_kapi.c
net/xfrm/xfrm_policy.c

Simple merge
Simple merge
diff --cc net/ipv4/igmp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -160,10 -160,10 +160,10 @@@ int netlbl_cfg_unlbl_map_add(const cha
                        map6->list.addr.s6_addr32[1] &= mask6->s6_addr32[1];
                        map6->list.addr.s6_addr32[2] &= mask6->s6_addr32[2];
                        map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3];
 -                      ipv6_addr_copy(&map6->list.mask, mask6);
 +                      map6->list.mask = *mask6;
                        map6->list.valid = 1;
-                       ret_val = netlbl_af4list_add(&map4->list,
-                                                    &addrmap->list4);
+                       ret_val = netlbl_af6list_add(&map6->list,
+                                                    &addrmap->list6);
                        if (ret_val != 0)
                                goto cfg_unlbl_map_add_failure;
                        break;
Simple merge