David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... There were quite a few overlapping sets of changes here. Daniel's bug fix for off-by-ones in the new BPF branch instructions, along with the added allowances for "data_end > ptr + x" forms collided with the metadata additions. Along with those three changes came veritifer test cases, which in their final form I tried to group together properly. If I had just trimmed GIT's conflict tags as-is, this would have split up the meta tests unnecessarily. In the socketmap code, a set of preemption disabling changes overlapped with the rename of bpf_compute_data_end() to bpf_compute_data_pointers(). Changes were made to the mv88e6060.c driver set addr method which got removed in net-next. The hyperv transport socket layer had a locking change in 'net' which overlapped with a change of socket state macro usage in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-22 13:39:14 +01:00
..
3com	drivers/net/3com: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
8390
adaptec
adi	drivers: net: adi: use setup_timer() helper.	2017-09-21 11:44:43 -07:00
aeroflex
agere	drivers: net: et131x: use setup_timer() helper.	2017-09-21 11:44:39 -07:00
alacritech
allwinner
alteon
altera
amazon	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
amd	net: amd8111e: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
apm
apple	net: ethernet: apple: Convert timers to use timer_setup()	2017-10-18 12:40:25 +01:00
aquantia	net: aquantia: Bad udp rate on default interrupt coalescing	2017-10-21 12:32:24 +01:00
arc
atheros
aurora
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
brocade	bna: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
cadence
calxeda
cavium	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
chelsio	drivers, net, ethernet: convert clip_entry.refcnt from atomic_t to refcount_t	2017-10-22 02:22:38 +01:00
cirrus
cisco	drivers: net: enic: use setup_timer() helper.	2017-09-21 11:44:44 -07:00
davicom
dec	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
dlink	net: dl2k: Convert timers to use timer_setup()	2017-10-18 12:39:39 +01:00
emulex
ezchip
faraday	net: ftgmac100: Request clock and set speed	2017-10-18 12:09:06 +01:00
freescale	dpaa_eth: remove obsolete comment	2017-10-18 13:44:47 +01:00
fujitsu
hisilicon	net: hns3: Add mac loopback selftest support in hns3 driver	2017-10-22 02:16:26 +01:00
hp
huawei	net-next/hinic: Fix a case of Tx Queue is Stopped forever	2017-09-28 10:26:50 -07:00
i825xx
ibm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-05 18:19:22 -07:00
mediatek	drivers, net, ethernet: convert mtk_eth.dma_refcnt from atomic_t to refcount_t	2017-10-22 02:22:38 +01:00
mellanox	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
micrel	net: ksz884x: Convert timers to use timer_setup()	2017-10-18 12:39:39 +01:00
microchip
moxa
myricom
natsemi	drivers: net: natsemi: use setup_timer() helper.	2017-09-21 11:44:40 -07:00
neterion	net: neterion: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
netronome	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
nuvoton
nvidia	forcedeth: Convert timers to use timer_setup()	2017-10-18 12:39:39 +01:00
nxp
oki-semi	pch_gbe: Switch to new PCI IRQ allocation API	2017-10-16 21:12:32 +01:00
packetengines	drivers: net: packetengines: use setup_timer() helper.	2017-09-21 11:44:44 -07:00
pasemi
qlogic	qed: Fix iWARP out of order flow	2017-10-19 12:46:43 +01:00
qualcomm	Revert "net: qcom/emac: enforce DMA address restrictions"	2017-10-12 10:50:10 -07:00
rdc
realtek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
renesas	net: sh_eth: implement R-Car Gen[12] fallback compatibility strings	2017-10-20 08:32:24 +01:00
rocker	rocker: fix rocker_tlv_put_* functions for KASAN	2017-09-25 20:18:27 -07:00
samsung
seeq	net: seeq: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
sfc
sgi	net/ethernet/sgi: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
silan
sis	drivers: net: sis900: use setup_timer() helper.	2017-09-21 11:44:42 -07:00
smsc	drivers: net: smsc: use setup_timer() helper.	2017-09-21 11:44:41 -07:00
stmicro	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
sun	net: ethernet: sun: Convert timers to use timer_setup()	2017-10-18 12:40:26 +01:00
synopsys
tehuti
ti	net/ti/tlan: Convert timers to use timer_setup()	2017-10-18 12:39:36 +01:00
tile
toshiba	drivers: net: spider_net: use setup_timer() helper.	2017-09-21 11:44:40 -07:00
tundra
via
wiznet
xilinx
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c	drivers: net: fealnx: use setup_timer() helper.	2017-09-21 11:44:43 -07:00
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c