Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-10--09-00 (v6.11-rc6-1389-g9971624df4aa) remotes/brancher/net-next-2024-09-10--12-00 (v6.11-rc6-1393-gb9f2a0889799) ==== BASE DIFF ==== .../networking/device_drivers/ethernet/index.rst | 1 + .../device_drivers/ethernet/meta/fbnic.rst | 29 ++ MAINTAINERS | 1 + drivers/net/ethernet/faraday/ftgmac100.h | 2 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 3 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 59 ++- drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 75 ++++ drivers/net/ethernet/microchip/lan966x/Kconfig | 1 + drivers/net/ethernet/microchip/lan966x/Makefile | 1 + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 409 ++++++++------------- .../net/ethernet/microchip/lan966x/lan966x_main.h | 58 +-- drivers/net/mdio/fwnode_mdio.c | 3 +- net/smc/smc_pnet.c | 3 - net/smc/smc_sysctl.c | 11 + 14 files changed, 332 insertions(+), 324 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.wd6apbTJNm b/tmp/tmp.4se2Ruer5b index 91d72bc265fd..96d0c7055a1e 100644 --- a/tmp/tmp.wd6apbTJNm +++ b/tmp/tmp.4se2Ruer5b @@ -2,8 +2,17 @@ tc_action dbg profile patch selftests/bpf: Fix a btf_dump selftest failure forwarding: set timeout to 3 hours +mptcp: pm: Fix uaf in __timer_delete_sync +net: libwx: fix number of Rx and Tx descriptors +net/mlx5: Fix error path in multi-packet WQE transmit net: tighten bad gso csum offset check in virtio_net_hdr net: xilinx: axienet: Schedule NAPI in two steps +idpf: enable WB_ON_ITR +idpf: fix netdev Tx queue stop/wake +idpf: refactor Tx completion routines +netdevice: add netdev_tx_reset_subqueue() shorthand +idpf: convert to libeth Tx buffer completion +libeth: add Tx buffer completion helpers igb: Always call igb_xdp_ring_update_tail() under Tx lock ice: fix VSI lists confusion when adding VLANs ice: stop calling pci_disable_device() as we use pcim @@ -33,7 +42,6 @@ net: xilinx: axienet: Remove unused checksum variables r8169: Fix spelling mistake: "tx_underun" -> "tx_underrun" rtase: Fix spelling mistake: "tx_underun" -> "tx_underrun" net: dsa: microchip: update tag_ksz masks for KSZ9477 family -ieee802154: Fix build error MAINTAINERS: Add ethtool pse-pd to PSE NETWORK DRIVER net: phy: microchip_t1: Cable Diagnostics for lan887x net: rswitch: Fix a possible memory leak in rswitch_phy_device_init() @@ -121,29 +129,7 @@ net: phylink: Add phylink_set_fixed_link() to configure fixed link state in phyl net: phy: Fallback to C22 access if needed in phy_mii_ioctl() net: phy: Expose the direct mdiobus access functions net: dsa: felix: ignore pending status of TAS module when it's disabled -octeon_ep: Add SKB allocation failures handling in __octep_oq_process_rx() -net: ftgmac100: Enable TX interrupt to avoid TX timeout -net: mdiobus: Debug print fwnode handle instead of raw pointer -octeontx2-af: Modify SMQ flush sequence to drop packets -net/smc: add sysctl for smc_limit_hs -eth: fbnic: Add devlink firmware version info usbnet: fix cyclical race on disconnect with work queue -octeontx2-pf: Export common APIs -octeontx2-pf: Reuse PF max mtu value -octeontx2-pf: Add new APIs for queue memory alloc/free. -octeontx2-pf: Define common API for HW resources configuration -net: lan966x: refactor buffer reload function -net: lan966x: use a few FDMA helpers throughout -net: lan966x: ditch tx->last_in_use variable -net: lan966x: use library helper for freeing tx buffers -net: lan966x: use FDMA library for adding DCB's in the tx path -net: lan966x: use the FDMA library for allocation of tx buffers -net: lan966x: use library helper for freeing rx buffers -net: lan966x: use FDMA library for adding DCB's in the rx path -net: lan966x: use the FDMA library for allocation of rx buffers -net: lan966x: replace a few variables with new equivalent ones -net: lan966x: use FDMA library symbols -net: lan966x: select FDMA library net: stmmac: Add BCM8958x driver to build system net: stmmac: Add PCI driver support for BCM8958x net: stmmac: Integrate dw25gmac into stmmac hwif handling