linux_dsm_epyc7002/drivers/net/ethernet/intel/ixgbevf
David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-11 20:53:22 -04:00
..
defines.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
ethtool.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
ixgbevf_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-05-11 20:53:22 -04:00
ixgbevf.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
Makefile net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
mbx.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
mbx.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
regs.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
vf.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
vf.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00