Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-31--00-00 (v6.12-rc4-1182-g8be1b830b6b7) remotes/brancher/net-next-2024-10-31--03-00 (v6.12-rc4-1189-ga9aefc785ac1) ==== BASE DIFF ==== .../bindings/net/microchip,sparx5-switch.yaml | 20 +- .../devicetree/bindings/net/qcom,ethqos.yaml | 19 +- .../devicetree/bindings/net/renesas,ether.yaml | 3 + MAINTAINERS | 13 + arch/s390/include/asm/stp.h | 1 + arch/s390/include/asm/timex.h | 6 + arch/s390/kernel/time.c | 7 + drivers/net/ethernet/brocade/bna/bnad.h | 1 - drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 31 +- .../net/ethernet/google/gve/gve_buffer_mgmt_dqo.c | 3 +- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 4 +- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 15 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 226 +++++++------ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 5 +- drivers/net/ethernet/mediatek/mtk_wed_wo.h | 4 +- drivers/net/ethernet/mellanox/mlxsw/pci.c | 25 +- .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 26 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 7 + drivers/net/ethernet/microchip/Kconfig | 1 + drivers/net/ethernet/microchip/Makefile | 1 + drivers/net/ethernet/microchip/lan969x/Kconfig | 5 + drivers/net/ethernet/microchip/lan969x/Makefile | 12 + drivers/net/ethernet/microchip/lan969x/lan969x.c | 350 +++++++++++++++++++++ drivers/net/ethernet/microchip/lan969x/lan969x.h | 57 ++++ .../ethernet/microchip/lan969x/lan969x_calendar.c | 191 +++++++++++ .../net/ethernet/microchip/lan969x/lan969x_regs.c | 222 +++++++++++++ .../ethernet/microchip/sparx5/sparx5_calendar.c | 72 +++-- .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 2 +- .../net/ethernet/microchip/sparx5/sparx5_main.c | 82 ++++- .../net/ethernet/microchip/sparx5/sparx5_main.h | 75 ++++- .../ethernet/microchip/sparx5/sparx5_main_regs.h | 132 ++++++++ .../net/ethernet/microchip/sparx5/sparx5_mirror.c | 10 +- .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 26 +- .../net/ethernet/microchip/sparx5/sparx5_packet.c | 16 +- .../net/ethernet/microchip/sparx5/sparx5_port.c | 46 +++ drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 15 +- drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 3 +- .../net/ethernet/microchip/sparx5/sparx5_regs.c | 5 +- .../net/ethernet/microchip/sparx5/sparx5_regs.h | 5 +- .../net/ethernet/microchip/sparx5/sparx5_sdlb.c | 10 +- .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 5 + drivers/net/ethernet/mscc/ocelot_flower.c | 54 +++- drivers/ptp/Kconfig | 11 + drivers/ptp/Makefile | 1 + drivers/ptp/ptp_s390.c | 129 ++++++++ include/linux/clocksource_ids.h | 1 + include/net/flow_offload.h | 1 + include/net/pkt_cls.h | 1 + net/core/dev.c | 4 + net/core/rtnetlink.c | 6 +- net/dsa/user.c | 78 +++-- .../selftests/net/forwarding/ip6gre_flat.sh | 14 + .../selftests/net/forwarding/ip6gre_flat_key.sh | 14 + .../selftests/net/forwarding/ip6gre_flat_keys.sh | 14 + .../selftests/net/forwarding/ip6gre_hier.sh | 14 + .../selftests/net/forwarding/ip6gre_hier_key.sh | 14 + .../selftests/net/forwarding/ip6gre_hier_keys.sh | 14 + .../testing/selftests/net/forwarding/ip6gre_lib.sh | 80 +++++ 58 files changed, 1951 insertions(+), 258 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.iW0wzdI4tZ b/tmp/tmp.WqqU9QgO2H index fa13d2b3f1f2..b507e8227faf 100644 --- a/tmp/tmp.iW0wzdI4tZ +++ b/tmp/tmp.WqqU9QgO2H @@ -9,7 +9,13 @@ sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket net: enetc: prevent VF from configuring preemptiable TCs net: xilinx: axienet: Check if Tx queue enabled net: xilinx: axienet: Enqueue Tx packets in dql before dmaengine starts +selftests: netdevsim: add fib_notifications to Makefile +dql: annotate data-races around dql->last_obj_cnt +net: ipv4: Cache pmtu for all packet paths if multipath enabled +ieee802154: ca8210: Add missing check for kfifo_alloc() in ca8210_probe() sctp: properly validate chunk size in sctp_sf_ootb() +mctp pcc: Implement MCTP over PCC Transport +mctp pcc: Check before sending MCTP PCC response ACK net: dpaa_eth: extract hash using __be32 pointer in rx_default_dqrr() net: dpaa_eth: add assertions about SGT entry offsets in sg_fd_to_skb() soc: fsl_qbman: use be16_to_cpu() in qm_sg_entry_get_off() @@ -53,12 +59,6 @@ net: wwan: t7xx: Change PM_AUTOSUSPEND_MS to 5000 fsl/fman: Validate cell-index value obtained from Device Tree net: ncsi: check for netlink-driven responses before requiring a handler net: dsa: use ethtool string helpers -bna: Remove field bnad_dentry_files[] in struct bnad -bna: Remove error checking for debugfs create APIs -netcons: Add udp send fail statistics to netconsole -netpoll: Make netpoll_send_udp return status instead of void -rtnetlink: Fix an error handling path in rtnl_newlink() -net: ethernet: mtk_wed: fix path of MT7988 WO firmware net: hibmcge: Add nway_reset supported in this module net: hibmcge: Add reset supported in this module net: hibmcge: Add pauseparam supported in this module @@ -78,11 +78,6 @@ lib: packing: demote truncation error in pack() to a warning in __pack() lib: packing: create __pack() and __unpack() variants without error checking net: freescale: use ethtool string helpers bnx2x: remove redundant NULL-pointer check -selftests: forwarding: Add IPv6 GRE remote change tests -mlxsw: spectrum_ipip: Fix memory leak when changing remote IPv6 address -mlxsw: pci: Sync Rx buffers for device -mlxsw: pci: Sync Rx buffers for CPU -mlxsw: spectrum_ptp: Add missing verification before pushing Tx header net: netpoll: flush skb pool during cleanup net: netpoll: Individualize the skb pool net: netpoll: Defer skb_pool population until setup success @@ -108,7 +103,6 @@ uapi: wireless: Avoid -Wflex-array-member-not-at-end warnings uapi: socket: Introduce struct sockaddr_legacy bonding: add ESP offload features when slaves support net: define and implement new SOL_SOCKET SO_RX_IFINDEX option -net: skip offload for NETIF_F_IPV6_CSUM if ipv6 header contains extension net: phy: dp83822: Configure RMII mode on DP83825 devices selftests: hsr: Add test for VLAN net: ti: icssg-prueth: Add VLAN support for HSR mode @@ -117,39 +111,4 @@ net: hsr: Add VLAN support net: tcp: Add noinline_for_tracing annotation for tcp_drop_reason() compiler_types: Add noinline_for_tracing annotation net/smc: use new helper to get the netdev associated to an ibdev -net: pse-pd: Add missing of_node_get() before of_find_node_by_name() -net: bcmasp: Add missing of_node_get() before of_find_node_by_name() -gve: change to use page_pool_put_full_page when recycling pages -net: sparx5: add feature support -net: sparx5: add compatible string for lan969x -dt-bindings: net: add compatible strings for lan969x targets -net: sparx5: use is_sparx5() macro throughout -net: lan969x: add function for calculating the DSM calendar -net: lan969x: add PTP handler function -net: lan969x: add lan969x ops to match data -net: lan969x: add constants to match data -net: lan969x: add register diffs to match data -net: lan969x: add match data for lan969x -net: sparx5: add registers required by lan969x -net: sparx5: add sparx5 context pointer to a few functions -net: sparx5: change frequency calculation for SDLB's -net: sparx5: change spx5_wr to spx5_rmw in cal update() -net: sparx5: add support for lan969x targets and core clock -connector/cn_proc: Selftest for threads -connector/cn_proc: Kunit tests for threads hash table -connector/cn_proc: Add hash table for threads -octeontx2-pf: Move shared APIs to header file -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: mscc: ocelot: allow tc-flower mirred action towards foreign interfaces -net: dsa: allow matchall mirroring rules towards the CPU -net: dsa: add more extack messages in dsa_user_add_cls_matchall_mirred() -net: dsa: use "extack" as argument to flow_action_basic_hw_stats_check() -net: dsa: clean up dsa_user_add_cls_matchall() -net: sched: propagate "skip_sw" flag to struct flow_cls_common_offload -bonding: add ns target multicast address to slave device -net: Implement fault injection forcing skb reallocation -s390/time: Add PtP driver -s390/time: Add clocksource id to TOD clock Bluetooth: hci: fix null-ptr-deref in hci_read_supported_codecs