Cross-merge networking fixes after downstream PR (net-6.17-rc8). Conflicts: drivers/net/can/spi/hi311x.c |
||
|---|---|---|
| .. | ||
| mcp251xfd | ||
| Kconfig | ||
| Makefile | ||
| hi311x.c | ||
| mcp251x.c | ||
Cross-merge networking fixes after downstream PR (net-6.17-rc8). Conflicts: drivers/net/can/spi/hi311x.c |
||
|---|---|---|
| .. | ||
| mcp251xfd | ||
| Kconfig | ||
| Makefile | ||
| hi311x.c | ||
| mcp251x.c | ||