Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-12--03-00 (v6.12-rc6-1479-ge260a41535b4) remotes/brancher/net-next-2024-11-12--06-00 (v6.12-rc6-1475-g4e941779ba0c) ==== BASE IDENTICAL ==== ==== COMMIT DIFF ==== diff --git a/tmp/tmp.zE76rsI6vb b/tmp/tmp.zDRqTE6tP1 index 12bcad22eeb6..a14b6f99c3be 100644 --- a/tmp/tmp.zE76rsI6vb +++ b/tmp/tmp.zDRqTE6tP1 @@ -3,7 +3,20 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours -net: use pdev instead of OF funcs +samples: pktgen: correct dev to DEV +virtio_net: xdp_features add NETDEV_XDP_ACT_XSK_ZEROCOPY +virtio_net: update tx timeout record +virtio_net: xsk: tx: support xmit xsk buffer +virtio_net: xsk: prevent disable tx napi +virtio_net: xsk: bind/unbind xsk for tx +virtio_net: refactor the xmit type +virtio_ring: remove API virtqueue_set_dma_premapped +virtio-net: rq submits premapped per-buffer +virtio_ring: introduce add api for premapped +virtio_ring: perform premapped operations based on per-buffer +virtio_ring: packed: record extras for indirect buffers +virtio_ring: split: record extras for indirect buffers +virtio_ring: introduce vring_need_unmap_buffer net: modernize ioremap in probe ipv6: Avoid invoking addrconf_verify_rtnl unnecessarily selftests: net: fdb_notify: Add a test for FDB notifications @@ -25,8 +38,6 @@ selftests: bonding: add ns multicast group testing bonding: add ns target multicast address to slave device net: ti: icssg-prueth: Fix 1 PPS sync net/ipv4/proc: Avoid usage for seq_printf() when reading /proc/net/snmp -eth: fbnic: Add devlink dev flash support -eth: fbnic: Add mailbox support for PLDM updates selftests: wireguards: use nft by default rtase: Fix error code in rtase_init_one() rtase: Add support for RTL907XD-VA PCIe port @@ -50,8 +61,6 @@ enic: Allocate arrays in enic struct based on VIC config enic: Save resource counts we read from HW enic: Make MSI-X I/O interrupts come after the other required ones enic: Create enic_wq/rq structures to bundle per wq/rq data -docs: net: Fix sfp-phylink whitespace -docs: net: Fix text in eth/intel, mlx5 and switchdev docs stmmac: dwmac-intel-plat: fix call balance of tx_clk handling routines bpf: lwtunnel: Prepare bpf_lwt_xmit_reroute() to future .flowi4_tos conversion. bpf: ipv4: Prepare __bpf_redirect_neigh_v4() to future .flowi4_tos conversion. @@ -60,20 +69,11 @@ net: phy: mediatek: Integrate read/write page helper functions net: phy: mediatek: Improve readability of mtk-phy-lib.c's mtk_phy_led_hw_ctrl_set() net: phy: mediatek: Move LED helper functions into mtk phy lib net: phy: mediatek: Re-organize MediaTek ethernet phy drivers -net: phylink: clean up phylink_resolve() -net: phylink: remove switch() statement in resolve handling -net: phylink: move MLO_AN_PHY resolve handling to if() statement -net: phylink: move MLO_AN_FIXED resolve handling to if() statement -net: phylink: move manual flow control setting -net: netconsole: selftests: Check if netdevsim is available ipmr: Fix access to mfc_cache_list without lock held net: phy: Add Airoha AN8855 Internal Switch Gigabit PHY net: dsa: Add Airoha AN8855 5-Port Gigabit DSA Switch driver dt-bindings: net: dsa: Add Airoha AN8855 Gigabit Switch documentation -mptcp: cope racing subflow creation in mptcp_rcv_space_adjust -mptcp: error out earlier on disconnect mctp i2c: notify user space on TX failure -net: ipv4: Cache pmtu for all packet paths if multipath enabled r8169: copy vendor driver 2.5G/5G EEE advertisement constraints net: phy: add phy_set_eee_broken net: phy: convert eee_broken_modes to a linkmode bitmap @@ -82,45 +82,20 @@ ipv4/udp: Add 4-tuple hash for connected socket net/udp: Add 4-tuple hash list basis net/udp: Add a new struct for hash2 slot Avoid traversing addrconf hash on ifdown +cn10k-ipsec: Enable outbound ipsec crypto offload +cn10k-ipsec: Allow ipsec crypto offload for skb with SA +cn10k-ipsec: Process outbound ipsec crypto offload +cn10k-ipsec: Add SA add/del support for outb ipsec crypto offload +cn10k-ipsec: Init hardware for outbound ipsec crypto offload +octeontx2-af: Disable backpressure between CPT and NIX +octeontx2-pf: Move skb fragment map/unmap to common code +octeontx2-pf: map skb data as device writeable eth: fbnic: Add support to dump registers net: sched: cls_api: improve the error message for ID allocation failure virtio/vsock: Improve MSG_ZEROCOPY error handling vsock: Fix sk_error_queue memory leak virtio/vsock: Fix accept_queue memory leak -net/mlx5e: SHAMPO, Rework header allocation loop -net/mlx5e: SHAMPO, Drop info array -net/mlx5e: SHAMPO, Change frag page setup order during allocation -net/mlx5e: SHAMPO, Fix page_index calculation inconsistency -net/mlx5e: SHAMPO, Simplify UMR allocation for headers -net/mlx5: Make vport QoS enablement more flexible for future extensions -net/mlx5: Integrate esw_qos_vport_enable logic into rate operations -net/mlx5: Generalize scheduling element operations -net/mlx5: Refactor scheduling element configuration bitmasks -net/mlx5: Generalize max_rate and min_rate setting for nodes -net/mlx5: Simplify QoS normalization by removing error handling -net/mlx5: E-switch, refactor eswitch mode change -net/mlx5: Enable unprivileged read of PCI VPD file -PCI/sysfs: Change read permissions for VPD attributes -net/mlx5e: Disable loopback self-test on multi-PF netdev -net/mlx5e: CT: Fix null-ptr-deref in add rule err flow -net/mlx5e: clear xdp features on non-uplink representors -net/mlx5e: kTLS, Fix incorrect page refcounting -net/mlx5: fs, lock FTE when checking if active -net/mlx5: Fix msix vectors to respect platform limit -net/mlx5: E-switch, unload IB representors when unloading ETH representors net: Implement fault injection forcing skb reallocation -Documentation: octeontx2: Add Documentation for RVU representors -octeontx2-pf: Adds TC offload support -octeontx2-pf: Implement offload stats ndo for representors -octeontx2-pf: Add devlink port support -octeontx2-pf: Add representors for sdp MAC -octeontx2-pf: Configure VF mtu via representor -octeontx2-pf: Add support to sync link state between representor and VFs -octeontx2-pf: Get VF stats via representor -octeontx2-af: Add packet path between representor and VF -octeontx2-pf: Add basic net_device_ops -octeontx2-pf: Create representor netdev -octeontx2-pf: RVU representor driver net: ip: make ip_route_use_hint() return drop reasons net: ip: make ip_mkroute_input/__mkroute_input return drop reasons net: ip: make ip_route_input() return drop reasons @@ -141,6 +116,27 @@ net: stmmac: Introduce dwmac1000 ptp_clock_info and operations net: stmmac: Only update the auto-discovered PTP clock features net: stmmac: Use per-hw ptp clock ops net: stmmac: Don't modify the global ptp ops directly +Merge branch 'mlx5-esw-qos-refactor-and-shampo-cleanup' +net/mlx5e: SHAMPO, Rework header allocation loop +net/mlx5e: SHAMPO, Drop info array +net/mlx5e: SHAMPO, Change frag page setup order during allocation +net/mlx5e: SHAMPO, Fix page_index calculation inconsistency +net/mlx5e: SHAMPO, Simplify UMR allocation for headers +net/mlx5: Make vport QoS enablement more flexible for future extensions +net/mlx5: Integrate esw_qos_vport_enable logic into rate operations +net/mlx5: Generalize scheduling element operations +net/mlx5: Refactor scheduling element configuration bitmasks +net/mlx5: Generalize max_rate and min_rate setting for nodes +net/mlx5: Simplify QoS normalization by removing error handling +net/mlx5: E-switch, refactor eswitch mode change +net: ipv4: Cache pmtu for all packet paths if multipath enabled +net: netconsole: selftests: Check if netdevsim is available +Merge branch 'net-phylink-phylink_resolve-cleanups' +net: phylink: clean up phylink_resolve() +net: phylink: remove switch() statement in resolve handling +net: phylink: move MLO_AN_PHY resolve handling to if() statement +net: phylink: move MLO_AN_FIXED resolve handling to if() statement +net: phylink: move manual flow control setting Merge branch 'suspend-irqs-during-application-busy-periods' docs: networking: Describe irq suspension selftests: net: Add busy_poll_test