linux_dsm_epyc7002/drivers/net/ethernet
Doug Ledford 894b82c427 Merge branch 'timer_setup' into for-next
Conflicts:
	drivers/infiniband/hw/cxgb4/cm.c
	drivers/infiniband/hw/qib/qib_driver.c
	drivers/infiniband/hw/qib/qib_mad.c

There were minor fixups needed in these files.  Just minor context diffs
due to patches from independent sources touching the same basic area.

Signed-off-by: Doug Ledford <dledford@redhat.com>
2017-10-18 13:12:09 -04:00
..
3com net: 3c59x: constify eisa_device_id 2017-08-19 17:13:41 -07:00
8390 net: ethernet: ax88796: make mdiobb_ops const 2017-08-22 14:20:54 -07:00
adaptec
adi net: ethernet: make ptp_clock_info const 2017-08-22 11:04:51 -07:00
aeroflex
agere
alacritech
allwinner
alteon
altera
amazon
amd dma-mapping updates for 4.14: 2017-09-12 13:30:06 -07:00
apm drivers: net: xgene: Remove return statement from void function 2017-09-05 14:58:25 -07:00
apple
aquantia atlantic: fix iommu errors 2017-09-26 13:44:31 -07:00
arc
atheros
aurora
broadcom cnic: Fix an error handling path in 'cnic_alloc_bnx2x_resc()' 2017-09-23 17:04:27 -07:00
brocade
cadence net: ethernet: make ptp_clock_info const 2017-08-22 11:04:51 -07:00
calxeda
cavium Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-09-06 14:45:08 -07:00
chelsio RDMA/cxgb3: Annotate an RCU pointer 2017-10-14 20:47:05 -04:00
cirrus
cisco
davicom davicom: Display proper debug level up to 6 2017-09-08 20:53:10 -07:00
dec net: tulip: Constify tulip_tbl 2017-09-08 20:53:10 -07:00
dlink
emulex be2net: fix TSO6/GSO issue causing TX-stall on Lancer/BEx 2017-09-13 09:28:18 -07:00
ezchip
faraday Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-09-01 17:42:05 -07:00
freescale net: fec: return IRQ_HANDLED if fec_ptp_check_pps_event handled it 2017-09-20 15:47:31 -07:00
fujitsu
hisilicon net: hns3: Fix an error handling path in 'hclge_rss_init_hw()' 2017-10-01 22:57:24 -07:00
hp net: hp100: constify eisa_device_id 2017-08-19 17:13:41 -07:00
huawei hinic: don't build the module by default 2017-08-28 21:39:52 -07:00
i825xx dma-mapping updates for 4.14: 2017-09-12 13:30:06 -07:00
ibm net: emac: Fix napi poll list corruption 2017-09-19 16:20:25 -07:00
intel Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 2017-09-05 20:03:40 -07:00
marvell net: mvpp2: Fix clock resource by adding an optional bus clock 2017-10-01 22:51:40 -07:00
mediatek net-next: mediatek: bring up QDMA RX ring 0 2017-08-09 22:45:36 -07:00
mellanox Merge branch 'timer_setup' into for-next 2017-10-18 13:12:09 -04:00
micrel
microchip
moxa
myricom
natsemi
neterion
netronome nfp: wait for the NSP resource to appear on boot 2017-09-13 13:29:13 -07:00
nuvoton w90p910_ether: include linux/interrupt.h 2017-09-12 20:59:19 -07:00
nvidia forcedeth: replace init_timer_deferrable with setup_deferrable_timer 2017-08-11 14:25:35 -07:00
nxp
oki-semi
packetengines
pasemi
qlogic qed: remove unnecessary call to memset 2017-09-15 14:02:05 -07:00
qualcomm net: qcom/emac: specify the correct size when mapping a DMA buffer 2017-09-25 16:34:29 -07:00
rdc
realtek 8139too: revisit napi_complete_done() usage 2017-09-18 20:57:00 -07:00
renesas net: sh_eth: constify platform_device_id 2017-08-13 20:12:23 -07:00
rocker rocker: fix rocker_tlv_put_* functions for KASAN 2017-09-25 20:18:27 -07:00
samsung net: sxgbe: check memory allocation failure 2017-08-25 20:07:07 -07:00
seeq sgiseeq: switch to dma_alloc_attrs 2017-08-29 10:02:54 +02:00
sfc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-08-15 20:23:23 -07:00
sgi
silan
sis
smsc net: smsc911x: Quieten netif during suspend 2017-09-15 14:24:49 -07:00
stmicro net: stmmac: dwmac-rk: Add RK3128 GMAC support 2017-10-03 15:39:56 -07:00
sun
synopsys
tehuti
ti net: ethernet: ti: netcp_core: no need in netif_napi_del 2017-09-08 20:53:10 -07:00
tile net: ethernet: make ptp_clock_info const 2017-08-22 11:04:51 -07:00
toshiba
tundra
via dmi: Mark all struct dmi_system_id instances const 2017-09-14 11:59:30 +02:00
wiznet
xilinx
xircom ethernet: xircom: small clean up in setup_xirc2ps_cs() 2017-08-22 10:30:00 -07:00
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig net-next/hinic: Initialize hw interface 2017-08-22 10:48:52 -07:00
korina.c
lantiq_etop.c
Makefile net-next/hinic: Initialize hw interface 2017-08-22 10:48:52 -07:00
netx-eth.c