xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa
android_kernel_xiaomi_sm8450/drivers/net/ethernet
History
David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
..
3com
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
8390
net: ethernet: ax88796: use phy_ethtool_{get|set}_link_ksettings
2016-06-16 17:07:05 -07:00
adaptec
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
adi
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
aeroflex
aeroflex/greth: fix warning about unused variable
2016-05-20 18:33:37 -07:00
agere
net: ethernet: et131x: use phy_ethtool_{get|set}_link_ksettings
2016-06-17 22:30:59 -07:00
allwinner
net: ethernet: sun4i-emac: use phy_ethtool_{get|set}_link_ksettings
2016-06-22 16:22:41 -04:00
alteon
…
altera
net: ethernet: altera_tse: use phy_ethtool_{get|set}_link_ksettings
2016-06-22 16:22:41 -04:00
amd
net: au1000_eth: fix PHY detection
2016-06-10 23:34:42 -07:00
apm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-15 13:32:48 -04:00
apple
…
arc
net: ethernet: arc: emac: use phy_ethtool_{get|set}_link_ksettings
2016-07-04 15:59:52 -07:00
atheros
net: alx: Work around the DMA RX overflow issue
2016-06-14 15:30:50 -04:00
aurora
net: ethernet: nb8800: use phy_ethtool_{get|set}_link_ksettings
2016-06-19 10:55:16 -07:00
broadcom
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
brocade
bna: fix list corruption
2016-03-01 15:19:43 -05:00
cadence
net: ethernet: macb: use phy_ethtool_{get|set}_link_ksettings
2016-06-25 11:57:33 -04:00
calxeda
…
cavium
liquidio: Response header changes
2016-07-04 16:15:32 -07:00
chelsio
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
cirrus
net: cx89x0: Add DT support
2016-06-15 12:17:57 -07:00
cisco
net: ethernet: enic: move to new ethtool api {get|set}_link_ksettings
2016-06-14 17:16:14 -04:00
davicom
drivers: net: Don't print unpopulated net_device name
2016-05-17 12:30:19 -04:00
dec
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
dlink
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
emulex
be2net: signedness bug in be_msix_enable()
2016-06-30 08:54:18 -04:00
ezchip
net: nps_enet: Disable interrupts before napi reschedule
2016-05-29 22:35:21 -07:00
faraday
net: ethernet: ftgmac100: use phy_ethtool_{get|set}_link_ksettings
2016-05-16 21:51:41 -04:00
freescale
Revert "fsl/fman: fix error handling"
2016-07-04 17:16:41 -07:00
fujitsu
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
hisilicon
net: hns: fix return value check in hns_dsaf_get_cfg()
2016-07-05 10:20:56 -07:00
hp
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
i825xx
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
ibm
ibmvnic: fix to use list_for_each_safe() when delete items
2016-06-29 05:23:42 -04:00
intel
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
marvell
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
mediatek
net-next: mediatek: remove superfluous free_irq() call
2016-07-04 23:55:56 -07:00
mellanox
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
micrel
drivers: net: Don't print unpopulated net_device name
2016-05-17 12:30:19 -04:00
microchip
enc28j60: Fix race condition in enc28j60 driver
2016-07-02 14:48:14 -04:00
moxa
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
myricom
myri10ge: fix sleeping with bh disabled
2016-04-28 14:21:14 -04:00
natsemi
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
neterion
drivers: net: remove NETDEV_TX_LOCKED
2016-04-26 15:53:05 -04:00
netronome
nfp: implement ethtool .get_link() callback
2016-06-30 09:12:14 -04:00
nuvoton
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
nvidia
forcedeth: Use setup_timer()
2016-02-25 16:51:05 -05:00
nxp
net: lpc_eth: Remove unused 'pldat' variable
2016-07-04 23:55:29 -07:00
oki-semi
pch_gbe: replace private tx ring lock with common netif_tx_lock
2016-04-28 17:19:58 -04:00
packetengines
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
pasemi
pasemi_mac: Replace LRO with GRO
2016-02-17 16:15:45 -05:00
qlogic
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
qualcomm
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
rdc
net: r6040: Bump version and date
2016-07-05 00:10:30 -07:00
realtek
r8169: default to 64-bit DMA on recent PCIe chips
2016-05-17 14:31:09 -04:00
renesas
ravb: Remove manual pause frame transmit
2016-06-01 23:33:21 -07:00
rocker
net: add dev arg to ndo_neigh_construct/destroy
2016-07-05 09:06:28 -07:00
samsung
net: ethernet: sxgbe: use phy_ethtool_{get|set}_link_ksettings
2016-06-28 09:12:35 -04:00
seeq
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
sfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-06-30 05:03:36 -04:00
sgi
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
silan
…
sis
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
smsc
net: ethernet: smsc: smsc911x: use phy_ethtool_{get|set}_link_ksettings
2016-07-04 15:59:52 -07:00
stmicro
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-07-06 10:35:22 -07:00
sun
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
synopsys
dwc_eth_qos: remove unused including <linux/version.h>
2016-07-05 00:09:22 -07:00
tehuti
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
ti
net: ethernet: davinci_emac: use phy_ethtool_{get|set}_link_ksettings
2016-07-02 14:51:11 -04:00
tile
net: tilegx: use correct timespec64 type
2016-06-17 22:27:38 -07:00
toshiba
net: tc35815: fix spelling mistake on "descriptors"
2016-06-27 04:17:38 -04:00
tundra
net: tsi108: use NULL for pointer-typed argument
2016-04-26 01:10:26 -04:00
via
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
wiznet
net: ethernet: wiznet: Remove create_workqueue
2016-06-02 12:15:17 -07:00
xilinx
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
xircom
ethernet: xircom: fix spelling mistakes on "excessive collisions"
2016-06-27 04:19:14 -04:00
xscale
net: ethernet: ixp4xx_eth: use phy_ethtool_{get|set}_link_ksettings
2016-07-04 15:59:52 -07:00
dnet.c
net: ethernet: dnet: use phy_ethtool_{get|set}_link_ksettings
2016-06-28 05:10:26 -04:00
dnet.h
net: ethernet: dnet: use phydev from struct net_device
2016-06-28 05:10:26 -04:00
ec_bhf.c
…
ethoc.c
net/ethoc: fix null dereference on error exit path
2016-06-01 22:02:01 -07:00
fealnx.c
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
jme.c
drivers/net/ethernet/jme.c: Deinline jme_reset_mac_processor, save 2816 bytes
2016-04-13 22:57:00 -04:00
jme.h
…
Kconfig
netdev: Move octeon/octeon_mgmt driver to cavium directory.
2016-03-18 18:25:30 -04:00
korina.c
treewide: replace dev->trans_start update with helper
2016-05-04 14:16:49 -04:00
lantiq_etop.c
net: ethernet: lantiq_etop: use phy_ethtool_{get|set}_link_ksettings
2016-07-04 15:59:51 -07:00
Makefile
netdev: Move octeon/octeon_mgmt driver to cavium directory.
2016-03-18 18:25:30 -04:00
netx-eth.c
drivers: net: Don't print unpopulated net_device name
2016-05-17 12:30:19 -04:00