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

No conflicts.

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

diff --cc drivers/i2c/i2c-core-base.c
Simple merge

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

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

diff --cc drivers/net/dsa/sja1105/sja1105_devlink.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
Simple merge

diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index f8382d3124e0c92bc71ea78daa82547acebee094,b6bbb3c9bd7a4e77944e7e39f62f4fde1f8ebfcc..d25f4f09faa06a03387288703a7ad82d0784fbcc
--- 1/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
--- 2/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@@ -920,9 -911,9 +922,10 @@@ static int mchp_sparx5_remove(struct pl
        sparx5_ptp_deinit(sparx5);
        sparx5_fdma_stop(sparx5);
        sparx5_cleanup_ports(sparx5);
 +      sparx5_vcap_destroy(sparx5);
        /* Unregister netdevs */
        sparx5_unregister_notifier_blocks(sparx5);
+       destroy_workqueue(sparx5->mact_queue);
  
        return 0;
  }

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

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

diff --cc drivers/net/phy/mxl-gpy.c
index 0ff7ef076072be915bb2d676adad0e97572fe35d,cae24091fb6f78e4bed7c2774d125136bdc16961..147d7a5a9b354c6d43f30a56adbbdd7aeb908c31
--- 1/drivers/net/phy/mxl-gpy.c
--- 2/drivers/net/phy/mxl-gpy.c
+++ b/drivers/net/phy/mxl-gpy.c
@@@ -78,9 -68,17 +79,17 @@@
                                 VSPEC1_SGMII_CTRL_ANRS)
  
  /* Temperature sensor */
 -#define VPSPEC1_TEMP_STA      0x0E
 -#define VPSPEC1_TEMP_STA_DATA GENMASK(9, 0)
 +#define VSPEC1_TEMP_STA       0x0E
 +#define VSPEC1_TEMP_STA_DATA  GENMASK(9, 0)
  
+ /* Mailbox */
+ #define VSPEC1_MBOX_DATA      0x5
+ #define VSPEC1_MBOX_ADDRLO    0x6
+ #define VSPEC1_MBOX_CMD               0x7
+ #define VSPEC1_MBOX_CMD_ADDRHI        GENMASK(7, 0)
+ #define VSPEC1_MBOX_CMD_RD    (0 << 8)
+ #define VSPEC1_MBOX_CMD_READY BIT(15)
+ 
  /* WoL */
  #define VPSPEC2_WOL_CTL               0x0E06
  #define VPSPEC2_WOL_AD01      0x0E08

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

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc include/net/mana/gdma.h
Simple merge

diff --cc net/dsa/tag_hellcreek.c
Simple merge

diff --cc net/dsa/tag_ksz.c
Simple merge

diff --cc net/dsa/tag_sja1105.c
Simple merge

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

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

diff --cc net/mac802154/iface.c
Simple merge

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

diff --cc tools/testing/selftests/net/.gitignore
index ee38ca888244fb8b4bef1659e3670fdb44c37a8f,ff8fe93f679cbe1ceae1226709167e4338e5c446..9cc84114741d388f7b7e9c979856c69418a0ea32
--- 1/tools/testing/selftests/net/.gitignore
--- 2/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@@ -1,7 -1,7 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  bind_bhash
 +csum
  cmsg_sender
+ diag_uid
  fin_ack_lat
  gro
  hwtstamp_config