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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_mcp.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
index 49a6e25,eaedc11..8ea1fa3
--- 1/drivers/net/ethernet/realtek/r8169.c
--- 2/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@@ -7396,9 -7734,24 +7396,8 @@@ static int rtl_init_one(struct pci_dev 
                return rc;
        }
  
-       /* override BIOS settings, use userspace tools to enable WOL */
-       __rtl8169_set_wol(tp, 0);
+       tp->saved_wolopts = __rtl8169_get_wol(tp);
  
 -      if (rtl_tbi_enabled(tp)) {
 -              tp->set_speed = rtl8169_set_speed_tbi;
 -              tp->get_link_ksettings = rtl8169_get_link_ksettings_tbi;
 -              tp->phy_reset_enable = rtl8169_tbi_reset_enable;
 -              tp->phy_reset_pending = rtl8169_tbi_reset_pending;
 -              tp->link_ok = rtl8169_tbi_link_ok;
 -              tp->do_ioctl = rtl_tbi_ioctl;
 -      } else {
 -              tp->set_speed = rtl8169_set_speed_xmii;
 -              tp->get_link_ksettings = rtl8169_get_link_ksettings_xmii;
 -              tp->phy_reset_enable = rtl8169_xmii_reset_enable;
 -              tp->phy_reset_pending = rtl8169_xmii_reset_pending;
 -              tp->link_ok = rtl8169_xmii_link_ok;
 -              tp->do_ioctl = rtl_xmii_ioctl;
 -      }
 -
        mutex_init(&tp->wk.mutex);
        u64_stats_init(&tp->rx_stats.syncp);
        u64_stats_init(&tp->tx_stats.syncp);

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

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

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

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

diff --cc net/tls/tls_sw.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc tools/bpf/bpftool/common.c
Simple merge

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge