David S. Miller e561bb29b6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-11-28 22:10:54 -08:00

..

e1000

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

e1000e

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

fm10k

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

i40e

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-11-28 22:10:54 -08:00

iavf

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

ice

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

igb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-11-28 22:10:54 -08:00

igbvf

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

igc

igc: Remove obsolete IGC_ERR define

2018-11-21 10:55:06 -08:00

ixgb

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2018-09-25 10:35:29 -07:00

ixgbe

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-11-28 22:10:54 -08:00

ixgbevf

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

e100.c

ethernet/intel: consolidate NAPI and NAPI exit

2018-11-21 10:35:23 -08:00

Kconfig

ixgbe/ixgbevf: fix XFRM_ALGO dependency

2018-10-31 10:53:15 -07:00

Makefile

igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support

2018-10-17 12:14:54 -07:00