linux/drivers/net/ethernet/intel
David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-19 22:59:33 -05:00
..
e1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-01-09 10:37:00 -05:00
e1000e e1000e: Fix e1000_check_for_copper_link_ich8lan return value. 2018-01-02 11:40:00 -08:00
fm10k Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-01-19 22:59:33 -05:00
i40e i40e: track id can be 0 2018-01-10 12:41:21 -08:00
i40evf i40e: track id can be 0 2018-01-10 12:41:21 -08:00
igb igb: Use smp_rmb rather than read_barrier_depends 2017-11-21 23:47:24 -08:00
igbvf igbvf: Use smp_rmb rather than read_barrier_depends 2017-11-21 23:46:04 -08:00
ixgb ethernet/intel: Convert timers to use timer_setup() 2017-10-18 12:40:26 +01:00
ixgbe ixgbe: Fix kernel-doc format warnings 2018-01-12 08:20:40 -08:00
ixgbevf ixgbevf: Fix kernel-doc format warnings 2018-01-12 08:20:47 -08:00
e100.c ethernet/intel: Convert timers to use timer_setup() 2017-10-18 12:40:26 +01:00
Kconfig
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00