Cross-merge networking fixes after downstream PR (net-7.0-rc8). Conflicts: net/ipv6/seg6_iptunnel.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| l2tp_core.c | ||
| l2tp_core.h | ||
| l2tp_debugfs.c | ||
| l2tp_eth.c | ||
| l2tp_ip.c | ||
| l2tp_ip6.c | ||
| l2tp_netlink.c | ||
| l2tp_ppp.c | ||
| trace.h | ||
Cross-merge networking fixes after downstream PR (net-7.0-rc8). Conflicts: net/ipv6/seg6_iptunnel.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| l2tp_core.c | ||
| l2tp_core.h | ||
| l2tp_debugfs.c | ||
| l2tp_eth.c | ||
| l2tp_ip.c | ||
| l2tp_ip6.c | ||
| l2tp_netlink.c | ||
| l2tp_ppp.c | ||
| trace.h | ||