Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Trivial conflict in CAN, keep the net-next + the byteswap wrapper.

Conflicts:
	drivers/net/can/usb/gs_usb.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2020-11-27 18:25:27 -08:00

..

e1000

e1000: remove unused and incorrect code

2020-10-13 19:44:01 -07:00

e1000e

e1000e: Add support for Meteor Lake

2020-09-28 14:42:46 -07:00

fm10k

net: don't include ethtool.h from netdevice.h

2020-11-23 17:27:04 -08:00

i40e

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

2020-11-27 18:25:27 -08:00

iavf

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

2020-10-05 18:40:01 -07:00

ice

devlink: move flash end and begin to core devlink

2020-11-19 21:41:02 -08:00

igb

net: intel: Remove in_interrupt() warnings

2020-09-29 14:02:54 -07:00

igbvf

igbvf: Refactor traces

2020-11-24 08:02:24 -08:00

igc

igc: Fix returning wrong statistics

2020-11-10 15:03:14 -08:00

ixgb

intel: handle unused assignments

2020-09-25 16:28:59 -07:00

ixgbe

net: remove unneeded break

2020-10-20 10:28:21 -07:00

ixgbevf

net: intel: Remove in_interrupt() warnings

2020-09-29 14:02:54 -07:00

e100.c

net: e100: Remove in_interrupt() usage and pointless GFP_ATOMIC allocation

2020-09-29 14:02:54 -07:00

Kconfig

ice: implement device flash update via devlink

2020-07-28 17:07:06 -07:00

Makefile

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

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