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

Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.

Minor context conflict in bcmsysport statistics bug fix.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
index bf9ca3c79d1ac839318e94bbad0fa2dcc29d959a,dc3052751bc13ed2248c218de01849d865dbe952..b3a21418f5114d52e7d2eb5fe10597e19d9290db
--- 1/drivers/net/ethernet/broadcom/bcmsysport.c
--- 2/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@@ -457,15 -450,11 +457,17 @@@ static void bcm_sysport_get_stats(struc
                else
                        p = (char *)priv;
  
 -
+               if (priv->is_lite && !bcm_sysport_lite_stat_valid(s->type))
+                       continue;
                p += s->stat_offset;
 -              data[j] = *(unsigned long *)p;
 +
 +              if (s->stat_sizeof == sizeof(u64))
 +                      do {
 +                              start = u64_stats_fetch_begin_irq(syncp);
 +                              data[i] = *(u64 *)p;
 +                      } while (u64_stats_fetch_retry_irq(syncp, start));
 +              else
 +                      data[i] = *(u32 *)p;
                j++;
        }
  

diff --cc drivers/net/geneve.c
Simple merge

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

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

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

diff --cc net/packet/af_packet.c
Simple merge