Single branch specified, using that and the previous one:
remotes/brancher/net-next-2024-09-09--09-00 (v6.11-rc6-1340-g375afcaa482d)
remotes/brancher/net-next-2024-09-09--12-00 (v6.11-rc6-1342-g70a071c45525)
==== BASE DIFF ====
MAINTAINERS | 7 +
drivers/net/dsa/microchip/Kconfig | 9 +-
drivers/net/dsa/microchip/Makefile | 2 +-
drivers/net/dsa/microchip/{ksz8795.c => ksz8.c} | 13 +-
drivers/net/dsa/microchip/ksz8863_smi.c | 4 +-
.../dsa/microchip/{ksz8795_reg.h => ksz8_reg.h} | 15 +-
drivers/net/dsa/microchip/ksz_common.c | 48 +-
drivers/net/dsa/microchip/ksz_common.h | 4 +-
drivers/net/dsa/microchip/ksz_spi.c | 6 +-
drivers/net/dsa/realtek/rtl8365mb.c | 2 +-
drivers/net/dsa/realtek/rtl8366rb.c | 2 +-
drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 4 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 -
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 11 +-
drivers/net/ethernet/freescale/fs_enet/Kconfig | 2 +-
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 444 ++--
drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 27 +-
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 17 +-
drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 15 +-
drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 11 +-
.../net/ethernet/freescale/fs_enet/mii-bitbang.c | 5 +-
drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 5 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 -
drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 -
drivers/net/ethernet/intel/igb/igb_ethtool.c | 8 +-
drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 -
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 -
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 4 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 20 -
drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 -
.../ethernet/microchip/lan966x/lan966x_ethtool.c | 11 +-
.../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 11 +-
.../net/ethernet/pensando/ionic/ionic_rx_filter.c | 4 +-
drivers/net/ethernet/realtek/Kconfig | 19 +
drivers/net/ethernet/realtek/Makefile | 1 +
drivers/net/ethernet/realtek/rtase/Makefile | 10 +
drivers/net/ethernet/realtek/rtase/rtase.h | 340 +++
drivers/net/ethernet/realtek/rtase/rtase_main.c | 2287 ++++++++++++++++++++
drivers/net/ethernet/sfc/ptp.c | 2 +-
drivers/net/ethernet/sfc/siena/efx_common.c | 7 -
drivers/net/ethernet/sfc/siena/ethtool.c | 1 -
drivers/net/ethernet/sfc/siena/ethtool_common.c | 125 +-
drivers/net/ethernet/sfc/siena/net_driver.h | 26 +-
drivers/net/ethernet/sfc/siena/ptp.c | 2 +-
drivers/net/ethernet/sfc/siena/rx_common.c | 56 -
drivers/net/ethernet/sfc/siena/rx_common.h | 4 -
drivers/net/ethernet/smsc/smc91x.c | 2 +-
drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 2 -
drivers/net/ethernet/ti/cpsw_ethtool.c | 7 +-
drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 2 -
drivers/net/ethernet/ti/netcp_ethss.c | 7 +-
drivers/net/phy/qcom/qca83xx.c | 10 +-
drivers/ptp/ptp_chardev.c | 8 +-
drivers/ptp/ptp_ocp.c | 20 +-
include/linux/platform_data/microchip-ksz.h | 2 +-
include/linux/ptp_clock_kernel.h | 36 +-
include/net/netfilter/nf_tables.h | 42 +-
include/net/netfilter/nf_tproxy.h | 1 +
include/net/netfilter/nft_fib.h | 4 +-
include/net/netfilter/nft_meta.h | 3 +-
include/net/netfilter/nft_reject.h | 3 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/ptp_clock.h | 24 +-
net/bridge/netfilter/ebtables.c | 2 +-
net/bridge/netfilter/nft_meta_bridge.c | 5 +-
net/bridge/netfilter/nft_reject_bridge.c | 3 +-
net/core/dev.c | 6 +-
net/core/net-sysfs.c | 4 +-
net/core/netpoll.c | 15 +-
net/hsr/hsr_device.c | 35 +-
net/hsr/hsr_forward.c | 4 +-
net/hsr/hsr_main.h | 6 +-
net/hsr/hsr_netlink.c | 2 +-
net/ipv4/ip_input.c | 6 +-
net/ipv4/netfilter/arp_tables.c | 2 +-
net/ipv4/netfilter/ip_tables.c | 2 +-
net/ipv6/ip6_input.c | 6 +-
net/ipv6/netfilter/ip6_tables.c | 2 +-
net/netfilter/core.c | 4 +-
net/netfilter/nf_conntrack_core.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 9 +-
net/netfilter/nf_nat_core.c | 2 +-
net/netfilter/nf_tables_api.c | 126 +-
net/netfilter/nft_compat.c | 6 +-
net/netfilter/nft_counter.c | 90 +-
net/netfilter/nft_dynset.c | 18 +-
net/netfilter/nft_fib.c | 3 +-
net/netfilter/nft_flow_offload.c | 3 +-
net/netfilter/nft_fwd_netdev.c | 3 +-
net/netfilter/nft_immediate.c | 3 +-
net/netfilter/nft_lookup.c | 3 +-
net/netfilter/nft_masq.c | 3 +-
net/netfilter/nft_meta.c | 6 +-
net/netfilter/nft_nat.c | 3 +-
net/netfilter/nft_osf.c | 3 +-
net/netfilter/nft_queue.c | 3 +-
net/netfilter/nft_redir.c | 3 +-
net/netfilter/nft_reject.c | 3 +-
net/netfilter/nft_reject_inet.c | 3 +-
net/netfilter/nft_reject_netdev.c | 3 +-
net/netfilter/nft_rt.c | 3 +-
net/netfilter/nft_socket.c | 3 +-
net/netfilter/nft_synproxy.c | 3 +-
net/netfilter/nft_tproxy.c | 3 +-
net/netfilter/nft_xfrm.c | 3 +-
net/sched/sch_taprio.c | 4 +-
net/tipc/socket.c | 6 +-
net/tls/tls_sw.c | 2 +-
110 files changed, 3289 insertions(+), 936 deletions(-)
==== COMMIT DIFF ====
diff --git a/tmp/tmp.C2Prkft7zt b/tmp/tmp.tV0SVAsNo5
index 3b186fd0b0aa..fa2059542324 100644
--- a/tmp/tmp.C2Prkft7zt
+++ b/tmp/tmp.tV0SVAsNo5
@@ -166,93 +166,8 @@ 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: sysfs: Fix weird usage of class's namespace relevant fields
-net: ethernet: fs_enet: phylink conversion
-net: ethernet: fs_enet: simplify clock handling with devm accessors
-net: ethernet: fs_enet: use macros for speed and duplex values
-net: ethernet: fs_enet: drop unused phy_info and mii_if_info
-net: ethernet: fs_enet: only protect the .restart() call in .adjust_link
-net: ethernet: fs_enet: drop the .adjust_link custom fs_ops
-net: ethernet: fs_enet: cosmetic cleanups
-net: ethernet: fs_enet: convert to SPDX
-net: hsr: remove seqnr_lock
net: stmmac: Add BCM8958x driver to build system
net: stmmac: Add PCI driver support for BCM8958x
net: stmmac: Integrate dw25gmac into stmmac hwif handling
net: stmmac: Add basic dw25gmac support in stmmac core
net: stmmac: Add HDMA mapping for dw25gmac support
-ptp/ioctl: support MONOTONIC{,_RAW} timestamps for PTP_SYS_OFFSET_EXTENDED
-net: sched: consistently use rcu_replace_pointer() in taprio_change()
-Merge tag 'nf-next-24-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next
-ptp: ocp: Improve PCIe delay estimation
-netpoll: remove netpoll_srcu
-Merge branch 'octeontx2-address-some-warnings'
-octeontx2-pf: Make iplen __be16 in otx2_sqe_add_ext()
-octeontx2-af: Pass string literal as format argument of alloc_workqueue()
-net: phy: qca83xx: use PHY_ID_MATCH_EXACT
-sfc: siena: rip out rss-context dead code
-Merge branch 'use-functionality-of-irq_get_trigger_type'
-net: smc91x: Make use of irq_get_trigger_type()
-net: dsa: realtek: rtl8366rb: Make use of irq_get_trigger_type()
-net: dsa: realtek: rtl8365mb: Make use of irq_get_trigger_type()
-net: tls: wait for async completion on last message
-Merge branch 'make-use-of-the-helper-macro-list_head'
-net/core: make use of the helper macro LIST_HEAD()
-net/ipv6: make use of the helper macro LIST_HEAD()
-net/netfilter: make use of the helper macro LIST_HEAD()
-net/tipc: make use of the helper macro LIST_HEAD()
-net/ipv4: make use of the helper macro LIST_HEAD()
-sfc: convert comma to semicolon
-sfc/siena: Convert comma to semicolon
-ionic: Convert comma to semicolon
-net: atlantic: convert comma to semicolon
-Merge branch 'rx-sw-tstamp-for-all'
-bnx2x: Remove setting of RX software timestamp
-cxgb4: Remove setting of RX software timestamp
-ixgbe: Remove setting of RX software timestamp
-igc: Remove setting of RX software timestamp
-igb: Remove setting of RX software timestamp
-ice: Remove setting of RX software timestamp
-i40e: Remove setting of RX software timestamp
-net: netcp: Remove setting of RX software timestamp
-net: ti: icssg-prueth: Remove setting of RX software timestamp
-net: ethernet: ti: cpsw_ethtool: Remove setting of RX software timestamp
-net: ethernet: ti: am65-cpsw-ethtool: Remove setting of RX software timestamp
-mlxsw: spectrum: Remove setting of RX software timestamp
-net: sparx5: Remove setting of RX software timestamp
-net: lan966x: Remove setting of RX software timestamp
-lan743x: Remove setting of RX software timestamp
-Merge branch 'microchip=ksz8-cleanup'
-net: dsa: microchip: replace unclear KSZ8830 strings
-net: dsa: microchip: clean up ksz8_reg definition macros
-net: dsa: microchip: rename ksz8 series files
-Merge branch 'add-realtek-automotive-pcie-driver'
-MAINTAINERS: Add the rtase ethernet driver entry
-realtek: Update the Makefile and Kconfig in the realtek folder
-rtase: Add a Makefile in the rtase folder
-rtase: Implement ethtool function
-rtase: Implement pci_driver suspend and resume function
-rtase: Implement net_device_ops
-rtase: Implement a function to receive packets
-rtase: Implement .ndo_start_xmit function
-rtase: Implement hardware configuration function
-rtase: Implement the interrupt routine and rtase_poll
-rtase: Implement the rtase_down function
-rtase: Implement the .ndo_open function
-rtase: Add support for a pci table in this module
-netfilter: nf_tables: set element timeout update support
-netfilter: nf_tables: zero timeout means element never times out
-netfilter: nf_tables: consolidate timeout extension for elements
-netfilter: nf_tables: annotate data-races around element expiration
-netfilter: nft_dynset: annotate data-races around set timeout
-netfilter: nf_tables: remove annotation to access set timeout while holding lock
-netfilter: nf_tables: reject expiration higher than timeout
-netfilter: nf_tables: reject element expiration with no timeout
-netfilter: nf_tables: elements with timeout below CONFIG_HZ never expire
-netfilter: nf_tables: Add missing Kernel doc
-netfilter: nf_tables: Correct spelling in nf_tables.h
-netfilter: nf_tables: drop unused 3rd argument from validate callback ops
-netfilter: conntrack: Convert to use ERR_CAST()
-netfilter: Use kmemdup_array instead of kmemdup for multiple allocation
-netfilter: nft_counter: Use u64_stats_t for statistic.
-netfilter: ctnetlink: support CTA_FILTER for flush