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

en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.

The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.h
Simple merge

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

diff --cc net/ipv4/esp4_offload.c
index 32fbd9b,29b333a..da5635f
--- 1/net/ipv4/esp4_offload.c
--- 2/net/ipv4/esp4_offload.c
+++ b/net/ipv4/esp4_offload.c
@@@ -116,8 -120,13 +116,11 @@@ static struct sk_buff *esp4_gso_segment
        struct xfrm_offload *xo = xfrm_offload(skb);
  
        if (!xo)
 -              goto out;
 +              return ERR_PTR(-EINVAL);
  
 -              goto out;
 -
 -      seq = xo->seq.low;
+       if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))
++              return ERR_PTR(-EINVAL);
+ 
        x = skb->sp->xvec[skb->sp->len - 1];
        aead = x->data;
        esph = ip_esp_hdr(skb);

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

diff --cc net/ipv6/esp6_offload.c
index 44d109c,f52c314..3fd1ec7
--- 1/net/ipv6/esp6_offload.c
--- 2/net/ipv6/esp6_offload.c
+++ b/net/ipv6/esp6_offload.c
@@@ -143,8 -147,13 +143,11 @@@ static struct sk_buff *esp6_gso_segment
        struct xfrm_offload *xo = xfrm_offload(skb);
  
        if (!xo)
 -              goto out;
 +              return ERR_PTR(-EINVAL);
  
 -              goto out;
 -
 -      seq = xo->seq.low;
+       if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))
++              return ERR_PTR(-EINVAL);
+ 
        x = skb->sp->xvec[skb->sp->len - 1];
        aead = x->data;
        esph = ip_esp_hdr(skb);

diff --cc net/rds/tcp.c
Simple merge

diff --cc net/rds/tcp.h
Simple merge

diff --cc net/rds/tcp_send.c
Simple merge