Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-05--12-00 (v6.11-rc5-1238-gd5e149ccca97) remotes/brancher/net-next-2024-09-05--15-00 (v6.11-rc5-1254-g685eb6da9069) ==== BASE DIFF ==== .../bindings/net/can/rockchip,rk3568v2-canfd.yaml | 74 ++ MAINTAINERS | 8 + drivers/net/can/Kconfig | 1 + drivers/net/can/Makefile | 1 + drivers/net/can/rockchip/Kconfig | 9 + drivers/net/can/rockchip/Makefile | 10 + drivers/net/can/rockchip/rockchip_canfd-core.c | 969 +++++++++++++++++++++ drivers/net/can/rockchip/rockchip_canfd-ethtool.c | 73 ++ drivers/net/can/rockchip/rockchip_canfd-rx.c | 299 +++++++ .../net/can/rockchip/rockchip_canfd-timestamp.c | 105 +++ drivers/net/can/rockchip/rockchip_canfd-tx.c | 167 ++++ drivers/net/can/rockchip/rockchip_canfd.h | 553 ++++++++++++ drivers/net/phy/motorcomm.c | 684 ++++++++++++++- 13 files changed, 2941 insertions(+), 12 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.O0yaxcAG8c b/tmp/tmp.4lNOCX2f39 index 4dcb2489f58a..80887c7936fa 100644 --- a/tmp/tmp.O0yaxcAG8c +++ b/tmp/tmp.4lNOCX2f39 @@ -2,6 +2,15 @@ tc_action dbg profile patch selftests/bpf: Fix a btf_dump selftest failure forwarding: set timeout to 3 hours +net: mdiobus: Debug print fwnode handle instead of raw pointer +ptp: ocp: Improve PCIe delay estimation +bpf: devmap: provide rxq after redirect +usbnet: fix cyclical race on disconnect with work queue +x25: specifying bcast_addr array size using macro +octeontx2-pf: Export common APIs +octeontx2-pf: Reuse PF max mtu value +octeontx2-pf: Add new APIs for queue memory alloc/free. +octeontx2-pf: Define common API for HW resources configuration octeontx2-af: Modify SMQ flush sequence to drop packets netpoll: remove netpoll_srcu net: lan966x: refactor buffer reload function @@ -20,14 +29,22 @@ rxtimestamp.c: add the test for SOF_TIMESTAMPING_OPT_RX_FILTER net-timestamp: extend SOF_TIMESTAMPING_OPT_RX_FILTER for hardware use net-timestamp: correct the use of SOF_TIMESTAMPING_RAW_HARDWARE net-timestamp: filter out report when setting SOF_TIMESTAMPING_SOFTWARE -net: stmmac: silence FPE kernel logs -net: stmmac: support fp parameter of tc-taprio -net: stmmac: support fp parameter of tc-mqprio -net: stmmac: configure FPE via ethtool-mm -net: stmmac: refactor FPE verification process -net: stmmac: drop stmmac_fpe_handshake -net: stmmac: move stmmac_fpe_cfg to stmmac_priv data net: mvneta: Avoid the misuse of the '_t' variants +net/mlx5: HWS, added API and enabled HWS support +net/mlx5: HWS, added send engine and context handling +net/mlx5: HWS, added debug dump and internal headers +net/mlx5: HWS, added backward-compatible API handling +net/mlx5: HWS, added memory management handling +net/mlx5: HWS, added vport handling +net/mlx5: HWS, added modify header pattern and args handling +net/mlx5: HWS, added FW commands handling +net/mlx5: HWS, added matchers functionality +net/mlx5: HWS, added definers handling +net/mlx5: HWS, added rules handling +net/mlx5: HWS, added tables handling +net/mlx5: HWS, added actions handling +net/mlx5: Added missing definitions in preparation for HW Steering +net/mlx5: Added missing mlx5_ifc definition for HW Steering net: ftgmac100: Fix potential NULL dereference in error handling net/mlx5: Added cond_resched() to crdump collection selftests/net: integrate packetdrill with ksft @@ -36,9 +53,6 @@ enic: Report per queue statistics in netdev qstats enic: Report per queue statistics in ethtool enic: Collect per queue statistics enic: Use macro instead of static const variables for array sizes -net: qcom/emac: Find sgmii_ops by device_for_each_child() -cxl/region: Find free cxl decoder by device_for_each_child() -net: stmmac: Programming sequence for VLAN packets with split header net: sysfs: Fix weird usage of class's namespace relevant fields net: phy: qca83xx: use PHY_ID_MATCH_EXACT eth: fbnic: Add devlink firmware version info @@ -62,31 +76,12 @@ ptp/ioctl: support MONOTONIC{,_RAW} timestamps for PTP_SYS_OFFSET_EXTENDED tools/net/ynl: fix cli.py --subscribe feature net: hsr: remove seqnr_lock MAINTAINERS: fix ptp ocp driver maintainers address -can: rockchip_canfd: add support for CAN_CTRLMODE_BERR_REPORTING -can: rockchip_canfd: add support for CAN_CTRLMODE_LOOPBACK -can: rockchip_canfd: add hardware timestamping support -can: rockchip_canfd: enable full TX-FIFO depth of 2 -can: rockchip_canfd: prepare to use full TX-FIFO depth -can: rockchip_canfd: add stats support for errata workarounds -can: rockchip_canfd: rkcanfd_get_berr_counter_corrected(): work around broken {RX,TX}ERRORCNT register -can: rockchip_canfd: implement workaround for erratum 12 -can: rockchip_canfd: implement workaround for erratum 6 -can: rockchip_canfd: add TX PATH -can: rockchip_canfd: rkcanfd_register_done(): add warning for erratum 5 -can: rockchip_canfd: rkcanfd_handle_rx_int_one(): implement workaround for erratum 5: check for empty FIFO -can: rockchip_canfd: add notes about known issues -can: rockchip_canfd: add support for rk3568v3 -can: rockchip_canfd: add quirk for broken CAN-FD support -can: rockchip_canfd: add quirks for errata workarounds -can: rockchip_canfd: add driver for Rockchip CAN-FD controller -dt-bindings: can: rockchip_canfd: add rockchip CAN-FD controller net: tls: wait for async completion on last message net: sched: use RCU read-side critical section in taprio_dump() net: sched: fix use-after-free in taprio_change() net: sched: consistently use rcu_replace_pointer() in taprio_change() net: enetc: Replace ifdef with IS_ENABLED net: ftgmac100: Enable TX interrupt to avoid TX timeout -net: phy: microchip_t1: SQI support for LAN887x sch_cake: constify inverse square root cache 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 @@ -142,5 +137,3 @@ rtase: Implement the interrupt routine and rtase_poll rtase: Implement the rtase_down function rtase: Implement the .ndo_open function rtase: Add support for a pci table in this module -net: phy: Add driver for Motorcomm yt8821 2.5G ethernet phy -net: phy: Optimize phy speed mask to be compatible to yt8821