1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/drivers/net/ethernet/renesas
Jakub Kicinski 173780ff18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/mlx5/driver.h
  617f5db1a6 ("RDMA/mlx5: Fix affinity assignment")
  dc13180824 ("net/mlx5: Enable devlink port for embedded cpu VF vports")
https://lore.kernel.org/all/20230613125939.595e50b8@canb.auug.org.au/

tools/testing/selftests/net/mptcp/mptcp_join.sh
  47867f0a7e ("selftests: mptcp: join: skip check if MIB counter not supported")
  425ba80312 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not")
  45b1a1227a ("mptcp: introduces more address related mibs")
  0639fa230a ("selftests: mptcp: add explicit check for new mibs")
https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-15 22:19:41 -07:00
..
Kconfig net: ethernet: renesas: rswitch: Fix build error about ptp 2022-11-14 18:37:20 -08:00
Makefile net: ethernet: renesas: rswitch: Add R-Car Gen4 gPTP support 2022-11-02 12:38:53 +00:00
ravb.h ravb: Add RZ/G2L MII interface support 2022-09-20 08:39:46 -07:00
ravb_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-03-17 16:29:25 -07:00
ravb_ptp.c ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm 2022-10-31 11:14:16 +00:00
rcar_gen4_ptp.c net: ethernet: renesas: rswitch: Add R-Car Gen4 gPTP support 2022-11-02 12:38:53 +00:00
rcar_gen4_ptp.h net: ethernet: renesas: rswitch: Add R-Car Gen4 gPTP support 2022-11-02 12:38:53 +00:00
rswitch.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-06-15 22:19:41 -07:00
rswitch.h net: renesas: rswitch: Use hardware pause features 2023-06-10 19:49:18 +01:00
sh_eth.c Revert "sh_eth: remove open coded netif_running()" 2023-03-28 19:23:32 -07:00
sh_eth.h Revert "sh_eth: remove open coded netif_running()" 2023-03-28 19:23:32 -07:00