Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-05-22--03-00 (v6.15-rc6-1455-gb271c83b997e) remotes/brancher/net-next-2025-05-22--06-00 (v6.15-rc6-1458-g93897e93dfcd) ==== BASE DIFF ==== .../devicetree/bindings/net/aeonsemi,as21xxx.yaml | 122 +++ .../device_drivers/ethernet/huawei/hinic3.rst | 137 +++ .../networking/device_drivers/ethernet/index.rst | 1 + MAINTAINERS | 14 + drivers/net/ethernet/cisco/enic/enic.h | 1 + drivers/net/ethernet/cisco/enic/enic_main.c | 3 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- drivers/net/ethernet/huawei/Kconfig | 1 + drivers/net/ethernet/huawei/Makefile | 1 + drivers/net/ethernet/huawei/hinic3/Kconfig | 20 + drivers/net/ethernet/huawei/hinic3/Makefile | 21 + drivers/net/ethernet/huawei/hinic3/hinic3_common.c | 53 + drivers/net/ethernet/huawei/hinic3/hinic3_common.h | 27 + drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c | 25 + drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.h | 53 + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.c | 32 + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.h | 13 + .../net/ethernet/huawei/hinic3/hinic3_hw_intf.h | 113 ++ drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c | 24 + drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.h | 81 ++ drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c | 21 + drivers/net/ethernet/huawei/hinic3/hinic3_hwif.h | 58 ++ drivers/net/ethernet/huawei/hinic3/hinic3_irq.c | 62 ++ drivers/net/ethernet/huawei/hinic3/hinic3_lld.c | 414 ++++++++ drivers/net/ethernet/huawei/hinic3/hinic3_lld.h | 21 + drivers/net/ethernet/huawei/hinic3/hinic3_main.c | 354 +++++++ drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c | 16 + drivers/net/ethernet/huawei/hinic3/hinic3_mbox.h | 15 + drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.h | 13 + .../ethernet/huawei/hinic3/hinic3_mgmt_interface.h | 105 ++ .../net/ethernet/huawei/hinic3/hinic3_netdev_ops.c | 78 ++ .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.c | 233 +++++ .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.h | 41 + .../net/ethernet/huawei/hinic3/hinic3_nic_dev.h | 82 ++ drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c | 21 + drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.h | 120 +++ .../ethernet/huawei/hinic3/hinic3_queue_common.c | 68 ++ .../ethernet/huawei/hinic3/hinic3_queue_common.h | 54 + drivers/net/ethernet/huawei/hinic3/hinic3_rx.c | 341 ++++++ drivers/net/ethernet/huawei/hinic3/hinic3_rx.h | 90 ++ drivers/net/ethernet/huawei/hinic3/hinic3_tx.c | 670 ++++++++++++ drivers/net/ethernet/huawei/hinic3/hinic3_tx.h | 135 +++ drivers/net/ethernet/huawei/hinic3/hinic3_wq.c | 29 + drivers/net/ethernet/huawei/hinic3/hinic3_wq.h | 76 ++ drivers/net/ethernet/intel/idpf/idpf_txrx.c | 18 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 28 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 31 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 4 + .../mellanox/mlx5/core/steering/hws/action.c | 71 +- .../mellanox/mlx5/core/steering/hws/action.h | 2 +- .../mellanox/mlx5/core/steering/hws/fs_hws.c | 71 +- .../mellanox/mlx5/core/steering/hws/fs_hws.h | 16 + .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 9 + .../mellanox/mlx5/core/steering/hws/pat_arg.c | 76 +- .../mellanox/mlx5/core/steering/hws/pat_arg.h | 5 +- .../mellanox/mlx5/core/steering/sws/fs_dr.c | 10 +- .../mellanox/mlx5/core/steering/sws/fs_dr.h | 10 +- drivers/net/ethernet/wangxun/libwx/wx_sriov.c | 2 +- drivers/net/phy/Kconfig | 12 + drivers/net/phy/Makefile | 1 + drivers/net/phy/as21xxx.c | 1087 ++++++++++++++++++++ drivers/net/phy/bcm87xx.c | 14 +- drivers/net/phy/icplus.c | 6 +- drivers/net/phy/marvell10g.c | 12 +- drivers/net/phy/micrel.c | 6 +- drivers/net/phy/nxp-c45-tja11xx.c | 41 +- drivers/net/phy/nxp-tja11xx.c | 6 +- drivers/net/phy/phy_device.c | 52 +- drivers/net/phy/realtek/realtek_main.c | 27 +- drivers/net/phy/teranetics.c | 3 +- drivers/nfc/s3fwrn5/core.c | 2 +- drivers/nfc/s3fwrn5/firmware.c | 2 +- drivers/nfc/s3fwrn5/firmware.h | 2 +- drivers/nfc/s3fwrn5/i2c.c | 2 +- drivers/nfc/s3fwrn5/nci.c | 2 +- drivers/nfc/s3fwrn5/nci.h | 2 +- drivers/nfc/s3fwrn5/phy_common.c | 4 +- drivers/nfc/s3fwrn5/phy_common.h | 4 +- drivers/nfc/s3fwrn5/s3fwrn5.h | 2 +- drivers/nfc/virtual_ncidev.c | 2 +- include/linux/phy.h | 6 +- net/core/dev.c | 10 +- rust/kernel/net/phy.rs | 1 + 83 files changed, 5330 insertions(+), 192 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.pA49MY5w31 b/tmp/tmp.uigv8WLHNW index f6991b729268..46db4aeac304 100644 --- a/tmp/tmp.pA49MY5w31 +++ b/tmp/tmp.uigv8WLHNW @@ -6,6 +6,9 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +xsk: add missing virtual address conversion for page +net: fix udp gso skb_segment after pull from frag_list +af_packet: move notifier's packet_dev_mc out of rcu critical section net: mana: Add handler for hardware servicing events vsock/test: Add test for an unexpectedly lingering close() vsock/test: Introduce enable_so_linger() helper @@ -39,11 +42,9 @@ net: ena: Control PHC enable through devlink net: ena: Add device reload capability through devlink net: ena: PHC silent reset net: ena: Add PHC support in the ENA driver -queue_api: add subqueue variant netif_subqueue_sent octeontx2-af: Send Link events one by one hv_netvsc: fix potential deadlock in netvsc_vf_setxdp() net: mctp: use nlmsg_payload() for netlink message data extraction -xsk: add missing virtual address conversion for page net: airoha: Add the capability to allocate hfwd descriptors in SRAM net: airoha: Add the capability to allocate hwfd buffers via reserved-memory net: airoha: Do not store hfwd references in airoha_qdma struct @@ -65,7 +66,6 @@ xfrm: Fix UDP GRO handling for some corner cases espintcp: remove encap socket caching to avoid reference leak espintcp: fix skb leaks net: neigh: use kfree_skb_reason() in neigh_resolve_output() and neigh_connected_output() -net/enic: Allow at least 8 RQs to always be used net: dsa: microchip: Add SGMII port support to KSZ9477 switch libeth: xdp, xsk: access adjacent u32s as u64 where applicable libeth: xsk: add XSkFQ refill and XSk wakeup helpers @@ -86,20 +86,12 @@ libeth: convert to netmem selftests: ncdevmem: add tx test with multiple IOVs selftests: ncdevmem: make chunking optional net: devmem: support single IOV with sendmsg -net/mlx5: HWS, handle modify header actions dependency -net/mlx5: HWS, fix typo - 'nope' to 'nop' -net/mlx5: HWS, register reformat actions with fw -net/mlx5: SWS, fix reformat id error handling net: enetc: fix NTMP build dependency ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use() net: ethernet: mtk_eth_soc: Correct spelling net: dlink: Correct endian treatment of t_SROM data -idpf: fix idpf_vport_splitq_napi_poll() -net: add debug checks in ____napi_schedule() and napi_poll() net: usb: aqc111: fix error handling of usbnet read calls -hinic3: module initialization and tx/rx logic net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done -nfc: Correct Samsung "Electronics" spelling in copyright headers eth: bnxt: fix deadlock when xdp is attached or detached octeontx2-af: NPC: Clear Unicast rule on nixlf detach selftest: af_unix: Test SO_PASSRIGHTS. @@ -112,22 +104,14 @@ scm: Move scm_recv() from scm.h to scm.c. af_unix: Don't pass struct socket to maybe_add_creds(). af_unix: Factorise test_bit() for SOCK_PASSCRED and SOCK_PASSPIDFD. net: mana: Add support for Multi Vports on Bare metal -emulex/benet: correct command version selection in be_cmd_get_stats() net: Add support for providing the PTP hardware source in tsinfo net: bonding: add tracepoint for 802.3ad net: bonding: send peer notify when failure recovery net: bonding: add broadcast_neighbor netlink option net: bonding: add broadcast_neighbor option for 802.3ad octeontx2-pf: Avoid adding dcbnl_ops for LBK and SDP vf -net: libwx: Fix log level selftests/tc-testing: Add an HFSC qlen accounting test sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() -dt-bindings: net: Document support for Aeonsemi PHYs -net: phy: Add support for Aeonsemi AS21xxx PHYs -net: phy: introduce genphy_match_phy_device() -net: phy: nxp-c45-tja11xx: simplify .match_phy_device OP -net: phy: bcm87xx: simplify .match_phy_device OP -net: phy: pass PHY driver to .match_phy_device OP socket: Clean up kdoc for sock_create() and sock_create_lite(). socket: Replace most sock_create() calls with sock_create_kern(). socket: Remove kernel socket conversion except for net/rds/.