mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 19:16:40 +07:00
58717686cf
Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
af_vsock.c | ||
af_vsock.h | ||
Kconfig | ||
Makefile | ||
vmci_transport_notify_qstate.c | ||
vmci_transport_notify.c | ||
vmci_transport_notify.h | ||
vmci_transport.c | ||
vmci_transport.h | ||
vsock_addr.c | ||
vsock_addr.h |