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

Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  3fbe4d8c0e53 ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
  924531326e2d ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")

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

diff --cc MAINTAINERS
index 91201c2b81908184e46838e0b7d4bb646333a5f4,e01e546f3a90c75c5a51e15736368b46051f60e2..4c2b84b95b1b0b4091413383f234898f53a9aaae
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14664,12 -14657,11 +14665,10 @@@ F:        net/ipv4/nexthop.
  
  NFC SUBSYSTEM
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
- L:    linux-nfc@lists.01.org (subscribers-only)
  L:    netdev@vger.kernel.org
  S:    Maintained
- B:    mailto:linux-nfc@lists.01.org
  F:    Documentation/devicetree/bindings/net/nfc/
  F:    drivers/nfc/
 -F:    include/linux/platform_data/nfcmrvl.h
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/

diff --cc drivers/net/dsa/b53/b53_mmap.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
index c099e873671654720b322b8c9fff2811e78bca37,fd07d6e142733445d9c5e398af2f258796a91e53..f9c9f2ea42065ee301343e3d94f9afb89c968636
--- 1/drivers/net/ethernet/mediatek/mtk_ppe.c
--- 2/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@@ -500,13 -459,7 +501,15 @@@ __mtk_foe_entry_clear(struct mtk_ppe *p
                hwe->ib1 &= ~MTK_FOE_IB1_STATE;
                hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
                dma_wmb();
+               mtk_ppe_cache_clear(ppe);
++
 +              if (ppe->accounting) {
 +                      struct mtk_foe_accounting *acct;
 +
 +                      acct = ppe->acct_table + entry->hash * sizeof(*acct);
 +                      acct->packets = 0;
 +                      acct->bytes = 0;
 +              }
        }
        entry->hash = 0xffff;
  

diff --cc drivers/net/ethernet/mediatek/mtk_ppe_offload.c
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_type.h
Simple merge

diff --cc drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
Simple merge

diff --cc drivers/net/ieee802154/ca8210.c
Simple merge

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

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

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

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

diff --cc io_uring/rsrc.c
Simple merge

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

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