mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
e800072c18
In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
af_vsock.c | ||
Kconfig | ||
Makefile | ||
vmci_transport.c | ||
vmci_transport.h | ||
vmci_transport_notify.c | ||
vmci_transport_notify.h | ||
vmci_transport_notify_qstate.c | ||
vsock_addr.c |