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

Just minor overlapping changes in the conflicts here.

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

diff --cc Documentation/PCI/pci-error-recovery.rst
index 7e30f43a9659b26b40d53d5ecf2245cd31b016b4,e5d450df06b4dedd91aa0507ea39181ebb845f6a..13beee23cb04fbf330994527a4e8f94128b61783
--- 1/Documentation/PCI/pci-error-recovery.rst
--- 2/Documentation/PCI/pci-error-recovery.rst
+++ b/Documentation/PCI/pci-error-recovery.rst
@@@ -421,3 -421,7 +421,6 @@@ That is, the recovery API only require
     - drivers/net/ixgbe
     - drivers/net/cxgb3
     - drivers/net/s2io.c
 -   - drivers/net/qlge
+ 
+ The End
+ -------

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/flexcan.c
index 09d8e623dcf637e25ccded9566133c31d7ceef26,fcec8bcb53d64cd246b1e003de157432ec32bd41..dc5695dffc2e371cc13315badd3569ef09786b1f
--- 1/drivers/net/can/flexcan.c
--- 2/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -1473,10 -1473,9 +1491,14 @@@ static int flexcan_setup_stop_mode(stru
  
        device_set_wakeup_capable(&pdev->dev, true);
  
 +      if (of_property_read_bool(np, "wakeup-source"))
 +              device_set_wakeup_enable(&pdev->dev, true);
 +
 +      return 0;
++
+ out_put_node:
+       of_node_put(gpr_np);
+       return ret;
  }
  
  static const struct of_device_id flexcan_of_match[] = {

diff --cc drivers/net/can/rcar/rcar_canfd.c
Simple merge

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

diff --cc drivers/net/ethernet/agere/et131x.c
Simple merge

diff --cc drivers/net/ethernet/atheros/ag71xx.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/Kconfig
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

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

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

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index c5d75e2ecf5443e67b28daa4af2cc2250d21fd08,7ecfc53cf5f6503df89dfc1983ed0b2290470247..4d97cc47835f2e4f1042da6972b8674aae618cd4
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -1338,20 -1248,16 +1338,20 @@@ void mlx5e_tc_update_neigh_used_value(s
                return;
  
        list_for_each_entry(e, &nhe->encap_list, encap_list) {
 -              struct encap_flow_item *efi;
 +              struct encap_flow_item *efi, *tmp;
                if (!(e->flags & MLX5_ENCAP_ENTRY_VALID))
                        continue;
 -              list_for_each_entry(efi, &e->flows, list) {
 +              list_for_each_entry_safe(efi, tmp, &e->flows, list) {
                        flow = container_of(efi, struct mlx5e_tc_flow,
                                            encaps[efi->index]);
 -                      if (flow->flags & MLX5E_TC_FLOW_OFFLOADED) {
 +                      if (IS_ERR(mlx5e_flow_get(flow)))
 +                              continue;
 +
 +                      if (mlx5e_is_offloaded_flow(flow)) {
                                counter = mlx5e_tc_get_counter(flow);
-                               mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);
+                               lastuse = mlx5_fc_query_lastuse(counter);
                                if (time_after((unsigned long)lastuse, nhe->reported_lastuse)) {
 +                                      mlx5e_flow_put(netdev_priv(e->out_dev), flow);
                                        neigh_used = true;
                                        break;
                                }

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

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

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

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rs.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

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

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

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

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/can/gw.c
Simple merge

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

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

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

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

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/rxrpc/ar-internal.h
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/vmw_vsock/hyperv_transport.c
Simple merge

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

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