Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-12--03-00 (v6.11-rc6-1594-ga6e1bd2b88eb) remotes/brancher/net-next-2024-09-12--06-00 (v6.11-rc6-1606-g0b76cb508872) ==== BASE DIFF ==== .../devicetree/bindings/net/microchip,lan8650.yaml | 74 ++ Documentation/netlink/specs/mptcp_pm.yaml | 1 - Documentation/netlink/specs/netdev.yaml | 61 + Documentation/networking/devmem.rst | 269 ++++ Documentation/networking/index.rst | 2 + Documentation/networking/oa-tc6-framework.rst | 497 +++++++ MAINTAINERS | 15 + arch/alpha/include/uapi/asm/socket.h | 6 + arch/mips/include/uapi/asm/socket.h | 6 + arch/parisc/include/uapi/asm/socket.h | 6 + arch/sparc/include/uapi/asm/socket.h | 6 + drivers/net/ethernet/Kconfig | 11 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/intel/idpf/idpf_dev.c | 2 + .../net/ethernet/intel/idpf/idpf_singleq_txrx.c | 110 +- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 395 +++--- drivers/net/ethernet/intel/idpf/idpf_txrx.h | 92 +- drivers/net/ethernet/intel/idpf/idpf_vf_dev.c | 2 + drivers/net/ethernet/microchip/Kconfig | 1 + drivers/net/ethernet/microchip/Makefile | 1 + drivers/net/ethernet/microchip/lan865x/Kconfig | 19 + drivers/net/ethernet/microchip/lan865x/Makefile | 6 + drivers/net/ethernet/microchip/lan865x/lan865x.c | 429 ++++++ drivers/net/ethernet/oa_tc6.c | 1361 ++++++++++++++++++++ drivers/net/phy/microchip_t1.c | 413 ++++++ drivers/net/phy/microchip_t1s.c | 30 + include/linux/netdevice.h | 15 +- include/linux/oa_tc6.h | 24 + include/linux/skbuff.h | 61 +- include/linux/skbuff_ref.h | 9 +- include/linux/socket.h | 1 + include/linux/virtio_net.h | 3 +- include/net/libeth/tx.h | 129 ++ include/net/libeth/types.h | 25 + include/net/netdev_rx_queue.h | 5 + include/net/netmem.h | 132 +- include/net/page_pool/helpers.h | 39 +- include/net/page_pool/types.h | 23 +- include/net/sock.h | 2 + include/net/tcp.h | 3 +- include/trace/events/page_pool.h | 12 +- include/uapi/asm-generic/socket.h | 6 + include/uapi/linux/mdio.h | 1 + include/uapi/linux/netdev.h | 13 + include/uapi/linux/uio.h | 18 + net/Kconfig | 5 + net/core/Makefile | 2 + net/core/datagram.c | 6 + net/core/dev.c | 33 +- net/core/devmem.c | 389 ++++++ net/core/devmem.h | 180 +++ net/core/gro.c | 3 +- net/core/mp_dmabuf_devmem.h | 44 + net/core/netdev-genl-gen.c | 23 + net/core/netdev-genl-gen.h | 6 + net/core/netdev-genl.c | 139 +- net/core/netdev_rx_queue.c | 81 ++ net/core/netmem_priv.h | 31 + net/core/page_pool.c | 119 +- net/core/page_pool_priv.h | 46 + net/core/page_pool_user.c | 32 +- net/core/skbuff.c | 77 +- net/core/sock.c | 68 + net/ethtool/common.c | 8 + net/ipv4/esp4.c | 3 +- net/ipv4/tcp.c | 263 +++- net/ipv4/tcp_input.c | 13 +- net/ipv4/tcp_ipv4.c | 16 + net/ipv4/tcp_minisocks.c | 2 + net/ipv4/tcp_output.c | 5 +- net/ipv6/esp6.c | 3 +- net/packet/af_packet.c | 4 +- net/xdp/xsk_buff_pool.c | 5 + tools/include/uapi/linux/netdev.h | 13 + tools/net/ynl/lib/.gitignore | 1 + tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 9 + tools/testing/selftests/net/ncdevmem.c | 570 ++++++++ 78 files changed, 6085 insertions(+), 452 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.G47Uz3EHax b/tmp/tmp.03ZHI7wKEU index ef0766cd55a0..580d583cbf9e 100644 --- a/tmp/tmp.G47Uz3EHax +++ b/tmp/tmp.03ZHI7wKEU @@ -28,6 +28,8 @@ net: phy: aquantia: search for firmware-name in fwnode net: phy: aquantia: allow firmware loading after aqr_wait_reset_complete net: phy: aquantia: add probe function to aqr105 for firmware loading Documentation: networking: Fix missing PSE documentation issue +net: dsa: lan9303: avoid dsa_switch_shutdown() +r8169: disable ALDPS per default for RTL8125 net: ethtool: phy: Clear the netdev context pointer for DUMP requests selftests: fib_rule_tests: Add DSCP selector connect tests selftests: fib_rule_tests: Add DSCP selector match tests @@ -35,6 +37,13 @@ net: fib_rules: Enable DSCP selector usage ipv6: fib_rules: Add DSCP selector support ipv4: fib_rules: Add DSCP selector support net: fib_rules: Add DSCP selector attribute +nfp: Use IRQF_NO_AUTOEN flag in request_irq() +net: enetc: Use IRQF_NO_AUTOEN flag in request_irq() +net: apple: bmac: Use IRQF_NO_AUTOEN flag in request_irq() +bareudp: Pull inner IP header on xmit. +bareudp: Pull inner IP header in bareudp_udp_encap_recv(). +bpf: selftests: send packet to devmap redirect XDP +bpf: devmap: provide rxq after redirect net: ti: icssg-prueth: Add multicast filtering support in HSR mode net: ti: icssg-prueth: Enable HSR Tx duplication, Tx Tag and Rx Tag offload net: ti: icssg-prueth: Add support for HSR frame forward offload @@ -45,21 +54,7 @@ uapi: libc-compat: remove ipx leftovers selftests/net: packetdrill: import tcp/slow_start selftests/net: packetdrill: import tcp/zerocopy selftests/net: packetdrill: run in netns and expand config -net: tighten bad gso csum offset check in virtio_net_hdr tcp: check skb is non-NULL in tcp_rto_delta_us() -netdev: add dmabuf introspection -selftests: add ncdevmem, netcat for devmem TCP -net: add devmem TCP documentation -net: add SO_DEVMEM_DONTNEED setsockopt to release RX frags -tcp: RX path for devmem TCP -net: add support for skbs with unreadable frags -net: support non paged skb frags -memory-provider: dmabuf devmem memory provider -page_pool: devmem support -netdev: netdevice devmem allocator -netdev: support binding dma-buf to netdevice -net: netdev netlink api to bind dma-buf to a net device -netdev: add netdev_rx_queue_restart() net: ag71xx: remove dead code path net: sockmap: avoid race between sock_map_destroy() and sk_psock_put() net: netconsole: fix wrong warning @@ -81,28 +76,6 @@ net: ethernet: ti: am65-cpsw: Introduce multi queue Rx net: ethtool: Enhance error messages sent to user space net: ethtool: Add support for writing firmware blocks using EPL payload net: ethtool: Add new parameters and a function to support EPL -net/mlx5: Fix error path in multi-packet WQE transmit -idpf: enable WB_ON_ITR -idpf: fix netdev Tx queue stop/wake -idpf: refactor Tx completion routines -netdevice: add netdev_tx_reset_subqueue() shorthand -idpf: convert to libeth Tx buffer completion -libeth: add Tx buffer completion helpers -net: phy: microchip_t1: Cable Diagnostics for lan887x net: ena: Extend customer metrics reporting support net: ena: Add ENA Express metrics support -dt-bindings: net: add Microchip's LAN865X 10BASE-T1S MACPHY -microchip: lan865x: add driver support for Microchip's LAN865X MAC-PHY -net: ethernet: oa_tc6: add helper function to enable zero align rx frame -net: ethernet: oa_tc6: implement mac-phy interrupt -net: ethernet: oa_tc6: implement receive path to receive rx ethernet frames -net: ethernet: oa_tc6: implement transmit path to transfer tx ethernet frames -net: ethernet: oa_tc6: enable open alliance tc6 data communication -net: phy: microchip_t1s: add c45 direct access in LAN865x internal PHY -net: ethernet: oa_tc6: implement internal PHY initialization -net: ethernet: oa_tc6: implement error interrupts unmasking -net: ethernet: oa_tc6: implement software reset -net: ethernet: oa_tc6: implement register read operation -net: ethernet: oa_tc6: implement register write operation -Documentation: networking: add OPEN Alliance 10BASE-T1x MAC-PHY serial interface selftests: net: ioam: add tunsrc support