David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -07:00
..
3com	net: prevent ISA drivers from building on PPC32	2018-07-22 11:12:29 -07:00
8390
adaptec	net: adaptec: Replace mdelay() with msleep() in starfire_init_one()	2018-07-26 21:24:23 -07:00
aeroflex
agere
alacritech
allwinner
alteon	net: alteon: acenic: remove redundant pointer rxdesc	2018-07-04 22:39:10 +09:00
altera
amazon	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
amd	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
apm
apple
aquantia	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
arc
atheros	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
aurora	net: ethernet: Make NET_VENDOR_AURORA default to yes	2018-07-05 20:05:54 +09:00
broadcom	net: systemport: Create helper to set MPD	2018-08-03 12:11:43 -07:00
brocade
cadence	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
calxeda
cavium	liquidio: remove redundant function cn23xx_dump_iq_regs	2018-07-30 09:27:21 -07:00
chelsio	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
cirrus	net: prevent ISA drivers from building on PPC32	2018-07-22 11:12:29 -07:00
cisco	net: cisco: enic: Replace GFP_ATOMIC with GFP_KERNEL	2018-08-04 13:08:06 -07:00
cortina	net: gemini: Indicate that we can handle jumboframes	2018-07-12 17:39:15 -07:00
davicom
dec
dlink
emulex	be2net: fix spelling mistake "seqence" -> "sequence"	2018-08-02 10:43:11 -07:00
ezchip
faraday
freescale	net: fec: check DMA addressing limitations	2018-08-02 10:19:24 -07:00
fujitsu
hisilicon	net: hns3: Refine the MSIX allocation for PF	2018-08-03 09:53:24 -07:00
hp
huawei	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
i825xx
ibm	ibmvnic: Fix error recovery on login failure	2018-07-16 14:39:47 -07:00
intel	ixgbe: Refactor queue disable logic to take completion time into account	2018-07-26 09:04:06 -07:00
marvell	net: mvneta: Improve the buffer allocation method for SWBM	2018-07-28 22:12:55 -07:00
mediatek	net-next: mediatek: cleanup unnecessary get chip id and its user	2018-07-29 13:15:57 -07:00
mellanox	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-05 13:04:31 -07:00
micrel	ethernet: micrel: remove redundant pointer 'info'	2018-07-04 22:39:11 +09:00
microchip	lan743x: Make symbol lan743x_pm_ops static	2018-07-25 16:37:55 -07:00
moxa
mscc	net: mscc: simplify retrieving the tag type from the frame header	2018-07-16 13:43:31 -07:00
myricom
natsemi
neterion	net: change Exar/Neterion menu items to be alphabetical	2018-08-01 09:49:02 -07:00
netronome	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
ni
nuvoton
nvidia	net: nvidia: forcedeth: Replace GFP_ATOMIC with GFP_KERNEL in nv_probe()	2018-07-27 13:45:14 -07:00
nxp
oki-semi
packetengines	net: ethernet: Add missing VENDOR to Cadence and Packet Engines symbols	2018-07-05 20:05:54 +09:00
pasemi
qlogic	qed: Make some functions static	2018-08-01 09:37:15 -07:00
qualcomm	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
rdc
realtek	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
renesas	sh_eth: make sh_eth_tsu_{read|write}_entry() prototypes symmetric	2018-07-23 12:34:50 -07:00
rocker
samsung
seeq
sfc	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
sgi
silan
sis
smsc	epic100: remove redundant variable 'irq'	2018-07-04 22:39:11 +09:00
socionext	net: socionext: remove redundant pointer ndev	2018-07-05 19:30:26 +09:00
stmicro	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
sun	net: allow ndo_select_queue to pass netdev	2018-07-09 13:41:34 -07:00
synopsys
tehuti	net: tehuti: remove redundant pointer skb	2018-07-05 19:33:39 +09:00
ti	net: ethernet: ti: cpsw: replace unnecessarily macroses on functions	2018-08-01 09:29:24 -07:00
toshiba
tundra
via
wiznet
xilinx	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c	net: jme: Replace mdelay() with msleep() and usleep_range() in jme_wait_link()	2018-07-27 13:45:14 -07:00
jme.h
Kconfig	net: change Exar/Neterion menu items to be alphabetical	2018-08-01 09:49:02 -07:00
korina.c
lantiq_etop.c	net: Add generic ndo_select_queue functions	2018-07-09 13:15:34 -07:00
Makefile	net: change Exar/Neterion menu items to be alphabetical	2018-08-01 09:49:02 -07:00
netx-eth.c