mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-12-10 02:07:52 +00:00
Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| nic_main.c | ||
| nic_reg.h | ||
| nic.h | ||
| nicvf_ethtool.c | ||
| nicvf_main.c | ||
| nicvf_queues.c | ||
| nicvf_queues.h | ||
| q_struct.h | ||
| thunder_bgx.c | ||
| thunder_bgx.h | ||