Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-05--12-00 (v6.12-rc5-1298-g03ff6192f576) remotes/brancher/net-next-2024-11-05--15-00 (v6.12-rc5-1303-g31d3235c88c5) ==== BASE DIFF ==== drivers/net/ethernet/hisilicon/hns3/hnae3.c | 5 +- drivers/net/ethernet/microchip/lan969x/Makefile | 3 +- drivers/net/ethernet/microchip/lan969x/lan969x.c | 3 + drivers/net/ethernet/microchip/lan969x/lan969x.h | 8 + .../microchip/lan969x/lan969x_vcap_ag_api.c | 3843 ++++++++++++++++++++ .../ethernet/microchip/lan969x/lan969x_vcap_impl.c | 85 + .../net/ethernet/microchip/sparx5/sparx5_main.c | 15 +- .../net/ethernet/microchip/sparx5/sparx5_main.h | 3 + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.h | 2 + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 48 +- .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 21 + 11 files changed, 3999 insertions(+), 37 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.pqbvlV8Rgj b/tmp/tmp.ZBFekJGZe3 index 329acf65ee71..65bdf74f5589 100644 --- a/tmp/tmp.pqbvlV8Rgj +++ b/tmp/tmp.ZBFekJGZe3 @@ -4,6 +4,27 @@ 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: ethernet: ti: am65-cpsw: enable DSCP to priority map for RX +net: ethernet: ti: am65-cpsw: update pri_thread_map as per IEEE802.1Q-2004 +bridge: Allow deleting FDB entries with non-existent VLAN +devlink: Add documentation for OcteonTx2 AF +octeontx2-af: Knobs for NPC default rule counters +octeontx2-af: Refactor few NPC mcam APIs +netlink: specs: Add a spec for FIB rule management +netlink: specs: Add a spec for neighbor tables in rtnetlink +tcp: fast path functions later +tcp: Pass flags to __tcp_send_ack +tcp: allow ECN bits in TOS/traffic class +tcp: AccECN support to tcp_add_backlog +gro: prevent ACE field corruption & better AccECN handling +gso: AccECN support +tcp: helpers for ECN mode handling +tcp: rework {__,}tcp_ecn_check_ce() -> tcp_data_ecn_check() +tcp: reorganize SYN ECN code +tcp: extend TCP flags to allow AE bit/ACE field +tcp: use BIT() macro in include/net/tcp.h +tcp: create FLAG_TS_PROGRESS +tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() net: enetc: Fix spelling mistake "referencce" -> "reference" net: dsa: microchip: parse PHY config from device tree net: dsa: microchip: add support for side MDIO interface in LAN937x @@ -17,14 +38,6 @@ bnxt_en: ethtool: Remove ip4/ip6 ntuple support for IPPROTO_RAW net/smc: Optimize the search method of reused buf_desc net/ipv6: Netlink flag for new IPv6 Default Routes tcp: avoid RST in 3-way shakehands due to failure in tcp_timewait_state_process -rtnetlink: Register rtnl_dellink() and rtnl_setlink() with RTNL_FLAG_DOIT_PERNET_WIP. -rtnetlink: Convert RTM_NEWLINK to per-netns RTNL. -netkit: Set IFLA_NETKIT_PEER_INFO to netkit_link_ops.peer_type. -vxcan: Set VXCAN_INFO_PEER to vxcan_link_ops.peer_type. -veth: Set VETH_INFO_PEER to veth_link_ops.peer_type. -rtnetlink: Add peer_type in struct rtnl_link_ops. -rtnetlink: Factorise rtnl_link_get_net_tb(). -rtnetlink: Introduce struct rtnl_nets and helpers. net: qrtr: mhi: synchronize qrtr and mhi preparation selftests: net: add a test for closing a netlink socket ith dump in progress netlink: terminate outstanding dump on socket close @@ -51,7 +64,6 @@ net: broadcom: use ethtool string helpers net: hisilicon: hns3: use ethtool string helpers net: bnx2x: use ethtool string helpers net: sfc: use ethtool string helpers -phonet: do not call synchronize_rcu() from phonet_route_del() selftests: netfilter: nft_queue.sh: fix warnings with socat 1.8.0.0 selftests: netfilter: run conntrack_dump_flush in netns net: arc: rockchip: fix emac mdio node support @@ -90,7 +102,6 @@ sfc: Remove unused mcdi functions sfc: Remove unused efx_mae_mport_vf sfc: Remove falcon deadcode net: phy: ti: add PHY_RST_AFTER_CLK_EN flag -mISDN: Fix typos r8169: improve initialization of RSS registers on RTL8125/RTL8126 dt-bindings: net: snps,dwmac: add support for Arria10 net: stmmac: add support for dwmac 3.72a @@ -99,20 +110,6 @@ net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case openvswitch: Pass on secpath details for internal port rx. net: phy: respect cached advertising when re-enabling EEE netfilter: netlink: Report extack policy errors for batched ops -octeon_ep_vf: add checks to fix NULL pointer dereferences -octeon_ep: add checks to fix NULL pointer dereferences -octeon_ep: Add checks to fix double free crashes. -net: hns3: fix kernel crash when uninstalling driver -net: lan969x: add VCAP configuration data -net: lan969x: add autogenerated VCAP information -net: sparx5: execute sparx5_vcap_init() on lan969x -net: sparx5: add new VCAP constants to match data -net: sparx5: replace SPX5_PORTS with n_ports -net: sparx5: expose some sparx5 VCAP symbols -ipv6: ip6_fib: fix possible null-pointer-dereference in ipv6_route_native_seq_show -selftests: net: really check for bg process completion -ipv6: release nexthop on device removal -mlx5: only schedule EQ comp tasklet if necessary mm: page_frag: use __alloc_pages() to replace alloc_pages_node() mm: page_frag: reuse existing space for 'size' and 'pfmemalloc' xtensa: remove the get_order() implementation