mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:46:16 +00:00
91afa49a3e
Cross-merge networking fixes after downstream PR (net-6.12-rc4). Conflicts: |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ravb_main.c | ||
ravb_ptp.c | ||
ravb.h | ||
rcar_gen4_ptp.c | ||
rcar_gen4_ptp.h | ||
rswitch.c | ||
rswitch.h | ||
rtsn.c | ||
rtsn.h | ||
sh_eth.c | ||
sh_eth.h |