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

Cross-merge networking fixes after downstream PR (net-6.17-rc8).

Conflicts:

tools/testing/selftests/drivers/net/bonding/Makefile
  87951b566446 selftests: bonding: add test for passive LACP mode
  c2377f1763e9 selftests: bonding: add test for LACP actor port priority

Adjacent changes:

drivers/net/ethernet/cadence/macb.h
  fca3dc859b20 net: macb: remove illusion about TBQPH/RBQPH being per-queue
  89934dbf169e net: macb: Add TAPRIO traffic scheduling support

drivers/net/ethernet/cadence/macb_main.c
  fca3dc859b20 net: macb: remove illusion about TBQPH/RBQPH being per-queue
  89934dbf169e net: macb: Add TAPRIO traffic scheduling support

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --cc Documentation/devicetree/bindings/net/cdns,macb.yaml
Simple merge

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

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

diff --cc drivers/net/ethernet/cadence/macb.h
index 9049546106116e1a6ce7abf2a9e17fc819d76bc9,a7e845fee4b3a2e3d14abb49abdbaf3e8e6ea02b..0830c48973aa0b9991f06c142d83b850572f2388
--- 1/drivers/net/ethernet/cadence/macb.h
--- 2/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@@ -1246,16 -1212,9 +1244,14 @@@ struct macb_queue 
        unsigned int            IDR;
        unsigned int            IMR;
        unsigned int            TBQP;
-       unsigned int            TBQPH;
        unsigned int            RBQS;
        unsigned int            RBQP;
-       unsigned int            RBQPH;
  
 +      /* ENST register offsets for this queue */
 +      unsigned int            ENST_START_TIME;
 +      unsigned int            ENST_ON_TIME;
 +      unsigned int            ENST_OFF_TIME;
 +
        /* Lock to protect tx_head and tx_tail */
        spinlock_t              tx_ptr_lock;
        unsigned int            tx_head, tx_tail;

diff --cc drivers/net/ethernet/cadence/macb_main.c
index e7ee8ade7aebc9e4e85495277fa2bf40a00b56e4,4af2ec705ba52c0686ece344b85d88984db853b8..ca2386b8347371810845290f6a7177a326fda4e7
--- 1/drivers/net/ethernet/cadence/macb_main.c
--- 2/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@@ -4542,18 -4326,8 +4545,12 @@@ static int macb_init(struct platform_de
                        queue->IMR  = MACB_IMR;
                        queue->TBQP = MACB_TBQP;
                        queue->RBQP = MACB_RBQP;
- #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-                       if (bp->hw_dma_cap & HW_DMA_CAP_64B) {
-                               queue->TBQPH = MACB_TBQPH;
-                               queue->RBQPH = MACB_RBQPH;
-                       }
- #endif
                }
  
 +              queue->ENST_START_TIME = GEM_ENST_START_TIME(hw_q);
 +              queue->ENST_ON_TIME = GEM_ENST_ON_TIME(hw_q);
 +              queue->ENST_OFF_TIME = GEM_ENST_OFF_TIME(hw_q);
 +
                /* get irq: here we use the linux queue index, not the hardware
                 * queue index. the queue irq definitions in the device tree
                 * must remove the optional gaps that could exist in the

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

diff --cc drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
Simple merge

diff --cc drivers/ptp/ptp_private.h
Simple merge

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

diff --cc tools/testing/selftests/drivers/net/bonding/Makefile
index 3462783ed3aca022e26c14e9f46b9cb46f05841e,c13ef40e7db13549c40535b9afbb0fffe0104d43..2f095cf67d9a01c427153fe3ec1cd454fb9bfb23
--- 1/tools/testing/selftests/drivers/net/bonding/Makefile
--- 2/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@@ -12,7 -12,7 +12,8 @@@ TEST_PROGS := 
        bond-eth-type-change.sh \
        bond_macvlan_ipvlan.sh \
        bond_passive_lacp.sh \
 +      bond_lacp_prio.sh
+       bond_ipsec_offload.sh
  
  TEST_FILES := \
        lag_lib.sh \