Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 0a49a8c7c564..fafe33bdb619 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2371,7 +2371,7 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,
                 int pos, idx, shift;
 
                 err = 0;
-                netlink_table_grab();
+                netlink_lock_table();
                 for (pos = 0; pos * 8 < nlk->ngroups; pos += sizeof(u32)) {
                         if (len - pos < sizeof(u32))
                                 break;
@@ -2386,7 +2386,7 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,
                 }
                 if (put_user(ALIGN(nlk->ngroups / 8, sizeof(u32)), optlen))
                         err = -EFAULT;
-                netlink_table_ungrab();
+                netlink_unlock_table();
                 break;
         }
         case NETLINK_CAP_ACK: