Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-08--00-00 (v6.13-rc1-458-g211b4ebeb9a8) remotes/brancher/net-next-2024-12-08--03-00 (v6.13-rc1-448-gf5c6ed8749f3) ==== BASE DIFF ==== drivers/net/ethernet/mscc/ocelot_ptp.c | 209 +++++++++++++--------- drivers/net/ethernet/realtek/rtase/rtase_main.c | 12 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- drivers/net/pcs/pcs-lynx.c | 22 +++ drivers/net/pcs/pcs-mtk-lynxi.c | 16 ++ drivers/net/pcs/pcs-xpcs.c | 28 +++ drivers/net/tun.c | 14 +- include/linux/dsa/ocelot.h | 1 + include/soc/mscc/ocelot.h | 2 - net/core/rtnetlink.c | 4 +- net/ipv4/route.c | 3 +- tools/net/ynl/ynl-gen-c.py | 8 +- 12 files changed, 226 insertions(+), 100 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.6fAuOOHf5l b/tmp/tmp.X6UU4mYdOx index 2acabb3d0417..462876e118d2 100644 --- a/tmp/tmp.6fAuOOHf5l +++ b/tmp/tmp.X6UU4mYdOx @@ -6,6 +6,17 @@ forwarding: set timeout to 3 hours net: dsa: microchip: KSZ9896 register regmap alignment to 32 bit boundaries dsa: mv88e6xxx: Centralise common statistics check dsa: mv88e6xxx: Move available stats into info structure +bpf: add simple bpf tests in the tx path for so_timstamping feature +net-timestamp: export the tskey for TCP bpf extension +net-timestamp: introduce cgroup lock to avoid affecting non-bpf cases +net-timestamp: make TCP tx timestamp bpf extension work +net-timestamp: support hwtstamp print for bpf extension +net-timestamp: support SCM_TSTAMP_ACK for bpf extension +net-timestamp: support SCM_TSTAMP_SND for bpf extension +net-timestamp: support SCM_TSTAMP_SCHED for bpf extension +net-timestamp: reorganize in skb_tstamp_tx_output() +net-timestamp: prepare for bpf prog use +net-timestamp: add support for bpf_setsockopt() rtnetlink: remove pad field in ndo_fdb_dump_context rtnetlink: switch rtnl_fdb_dump() to for_each_netdev_dump() rtnetlink: add ndo_fdb_dump_context @@ -19,10 +30,6 @@ ice: Fix quad registers read on E825 ice: Fix E825 initialization net: renesas: rswitch: remove speed from gwca structure net: renesas: rswitch: do not deinit disabled ports -net: renesas: rswitch: avoid use-after-put for a device tree node -net: renesas: rswitch: fix leaked pointer on error path -net: renesas: rswitch: fix race window between tx start and complete -net: renesas: rswitch: fix possible early skb release qca_spi: Make driver probing reliable qca_spi: Fix clock speed for multiple QCA7000 vsock/test: Add test for MSG_ZEROCOPY completion memory leak @@ -34,23 +41,6 @@ net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user ports on 6393X net: dsa: mv88e6xxx: Never force link on in-band managed MACs net: dsa: mv88e6xxx: Give chips more time to activate their PPUs net: dsa: mv88e6xxx: Improve I/O related error logging -net: stmmac: fix TSO DMA API usage causing oops -rtnetlink: fix error code in rtnl_newlink() -mm: page_frag: add an entry in MAINTAINERS for page_frag -net: replace page_frag with page_frag_cache -mm: page_frag: add testing for the newly added API -mm: page_frag: introduce probe related API -mm: page_frag: introduce alloc_refill prepare & commit API -mm: page_frag: introduce refill prepare & commit API -mm: page_frag: introduce page_frag_alloc_abort() related API -mm: page_frag: update documentation for page_frag -net: rename skb_copy_to_page_nocache() helper -mm: page_frag: some minor refactoring before adding new API -tools: ynl-gen-c: don't require -o argument -tools: ynl-gen-c: annotate valid choices for --mode -Fix clamp() of ip_vs_conn_tab on small memory systems. -net/mlx5e: Report rx_discards_phy via rx_fifo_errors -rtase: Refine the if statement octeon_ep: add ndo ops for VFs in PF driver cxgb4: use port number to set mac addr af_unix: Remove unix_our_peer(). @@ -69,7 +59,6 @@ af_unix: Set error only when needed in unix_stream_sendmsg(). af_unix: Clean up error paths in unix_stream_connect(). af_unix: Set error only when needed in unix_stream_connect(). netlink: add IGMP/MLD join/leave notifications -ip: Return drop reason if in_dev is NULL in ip_route_input_rcu(). net: phy: micrel: Dynamically control external clock of KSZ PHY virtio_net: ensure netdev_tx_reset_queue is called on bind xsk for tx virtio_ring: add a func argument 'recycle_done' to virtqueue_reset() @@ -105,26 +94,12 @@ vxlan: vxlan_rcv(): Extract vxlan_hdr(skb) to a named variable vxlan: vxlan_rcv() callees: Drop the unparsed argument vxlan: vxlan_rcv() callees: Move clearing of unparsed flags out vxlan: In vxlan_rcv(), access flags through the vxlan netdevice -net: mscc: ocelot: perform error cleanup in ocelot_hwstamp_set() -net: mscc: ocelot: be resilient to loss of PTP packets during transmission -net: mscc: ocelot: ocelot->ts_id_lock and ocelot_port->tx_skbs.lock are IRQ-safe -net: mscc: ocelot: improve handling of TX timestamp for unknown skb -net: mscc: ocelot: fix memory leak on ocelot_port_add_txtstamp_skb() net: sparx5: fix the maximum frame length register net: sparx5: fix default value of monitor ports net: sparx5: fix FDMA performance issue net: lan969x: fix the use of spin_lock in PTP handler net: lan969x: fix cyclic dependency reported by depmod -sock: Introduce SO_RCVPRIORITY socket option -selftests: net: test SO_PRIORITY ancillary data with cmsg_sender -sock: support SO_PRIORITY cmsg -sock: Introduce sk_set_prio_allowed helper function -ipv4: remove useless arg octeontx2-af: Fix installation of PF multicast rule -net: pcs: xpcs: implement pcs_inband_caps() method -net: pcs: pcs-mtk-lynxi: implement pcs_inband_caps() method -net: pcs: pcs-lynx: implement pcs_inband_caps() method -tun: fix group permission check ice: cleanup Rx queue context programming functions ice: move prefetch enable to ice_setup_rx_ctx ice: reduce size of queue context fields @@ -135,10 +110,8 @@ lib: packing: document recently added APIs lib: packing: add pack_fields() and unpack_fields() lib: packing: demote truncation error in pack() to a warning in __pack() lib: packing: create __pack() and __unpack() variants without error checking -cxgb4: add driver support for FW_CLIP2_CMD net: ethernet: oa_tc6: fix tx skb race condition between reference pointers net: ethernet: oa_tc6: fix infinite loop error when tx credits becomes 0 -net/sched: netem: account for backlog updates from child qdisc cn10k-ipsec: Enable outbound ipsec crypto offload cn10k-ipsec: Allow ipsec crypto offload for skb with SA cn10k-ipsec: Process outbound ipsec crypto offload