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

Conflicts:
	drivers/net/ethernet/cadence/macb.c
	drivers/net/phy/phy.c
	include/linux/skbuff.h
	net/ipv4/tcp.c
	net/switchdev/switchdev.c

Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.

phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.

tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.

macb.c involved the addition of two zyncq device entries.

skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_options.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb.c
index 5fca309,fc646a4..740d04f
--- 1/drivers/net/ethernet/cadence/macb.c
--- 2/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@@ -2723,15 -2702,14 +2732,24 @@@ static const struct macb_config emac_co
        .init = at91ether_init,
  };
  
++
 +static const struct macb_config zynqmp_config = {
 +      .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
 +              MACB_CAPS_JUMBO,
 +      .dma_burst_length = 16,
 +      .clk_init = macb_clk_init,
 +      .init = macb_init,
 +      .jumbo_max_len = 10240,
 +};
 +
+ static const struct macb_config zynq_config = {
+       .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
+               MACB_CAPS_NO_GIGABIT_HALF,
+       .dma_burst_length = 16,
+       .clk_init = macb_clk_init,
+       .init = macb_init,
+ };
+ 
  static const struct of_device_id macb_dt_ids[] = {
        { .compatible = "cdns,at32ap7000-macb" },
        { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
@@@ -2742,7 -2720,7 +2760,8 @@@
        { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
        { .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
        { .compatible = "cdns,emac", .data = &emac_config },
 +      { .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
+       { .compatible = "cdns,zynq-gem", .data = &zynq_config },
        { /* sentinel */ }
  };
  MODULE_DEVICE_TABLE(of, macb_dt_ids);

diff --cc drivers/net/ethernet/cadence/macb.h
Simple merge

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

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

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

diff --cc include/linux/gfp.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/linux/tcp.h
Simple merge

diff --cc lib/rhashtable.c
Simple merge

diff --cc net/bridge/br_multicast.c
Simple merge

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/netfilter/Kconfig
Simple merge

diff --cc net/netfilter/nfnetlink_queue_core.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/switchdev/switchdev.c
Simple merge