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

drivers/net/ipa/ipa_main.c
  8afc7e471ad3 ("net: ipa: separate disabling setup from modem stop")
  76b5fbcd6b47 ("net: ipa: kill ipa_modem_init()")

Duplicated include, drop one.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc drivers/net/dsa/qca8k.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot_vcap.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac.h
index dd7adf9b2537b339536480c8db66d9cd437f4833,5f129733aabd2e914a84a89b72e90bd3a41caaa2..689f3cdb24589354a71c7cf1c6b0433448d0434e
--- 1/drivers/net/ethernet/stmicro/stmmac/stmmac.h
--- 2/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@@ -314,10 -314,11 +314,11 @@@ int stmmac_mdio_reset(struct mii_bus *m
  int stmmac_xpcs_setup(struct mii_bus *mii);
  void stmmac_set_ethtool_ops(struct net_device *netdev);
  
+ int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags);
  void stmmac_ptp_register(struct stmmac_priv *priv);
  void stmmac_ptp_unregister(struct stmmac_priv *priv);
 -int stmmac_open(struct net_device *dev);
 -int stmmac_release(struct net_device *dev);
 +int stmmac_xdp_open(struct net_device *dev);
 +void stmmac_xdp_release(struct net_device *dev);
  int stmmac_resume(struct device *dev);
  int stmmac_suspend(struct device *dev);
  int stmmac_dvr_remove(struct device *dev);

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ipa/ipa_endpoint.c
Simple merge

diff --cc drivers/net/ipa/ipa_main.c
Simple merge

diff --cc drivers/net/ipa/ipa_modem.c
Simple merge

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

diff --cc include/soc/mscc/ocelot_vcap.h
Simple merge

diff --cc net/8021q/vlan.c
Simple merge

diff --cc net/8021q/vlan_dev.c
Simple merge

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

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

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

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

diff --cc net/mptcp/protocol.c
Simple merge

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

diff --cc net/smc/af_smc.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge