David S. Miller b4b12b0d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The phylink conflict was between a bug fix by Russell King to make sure we have a consistent PHY interface mode, and a change in net-next to pull some code in phylink_resolve() into the helper functions phylink_mac_link_{up,down}() On the dp83867 side it's mostly overlapping changes, with the 'net' side removing a condition that was supposed to trigger for RGMII but because of how it was coded never actually could trigger. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-31 10:49:43 -07:00
..
amd.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
aquantia_hwmon.c	net: phy: aquantia: add hwmon support	2019-02-25 14:16:22 -08:00
aquantia_main.c	net: phy: aquantia: add USXGMII support and warn if XGMII mode is set	2019-05-24 13:39:34 -07:00
aquantia.h	net: phy: aquantia: add hwmon support	2019-02-25 14:16:22 -08:00
asix.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
at803x.c	net: mdio: rename mdio_device reset to reset_gpio	2019-04-18 17:42:54 -07:00
bcm7xxx.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
bcm63xx.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
bcm87xx.c	net: phy: bcm87xx: improve bcm87xx_config_init and feature detection	2019-05-26 21:56:41 -07:00
bcm-cygnus.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
bcm-phy-lib.c	net: phy: Prepare for moving Omega out of bcm7xxx	2019-03-21 13:41:26 -07:00
bcm-phy-lib.h	net: phy: Prepare for moving Omega out of bcm7xxx	2019-03-21 13:41:26 -07:00
broadcom.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
cicada.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
cortina.c	net: phy: remove gen10g_no_soft_reset	2019-03-03 21:47:57 -08:00
davicom.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
dp83tc811.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
dp83640_reg.h
dp83640.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
dp83822.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
dp83848.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
dp83867.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-31 10:49:43 -07:00
et1011c.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
fixed_phy.c	net: phy: improve pause handling	2019-05-04 00:47:55 -04:00
icplus.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
intel-xway.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
Kconfig	net: phy: tja11xx: Add TJA11xx PHY driver	2019-05-26 13:39:11 -07:00
lxt.c	net: phy: lxt: Add suspend/resume support to LXT971 and LXT973.	2019-05-23 09:19:21 -07:00
Makefile	net: phy: tja11xx: Add TJA11xx PHY driver	2019-05-26 13:39:11 -07:00
marvell10g.c	net: phy: marvell10g: report if the PHY fails to boot firmware	2019-05-29 14:25:10 -07:00
marvell.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
mdio_bus.c	net: mdio: rename mdio_device reset to reset_gpio	2019-04-18 17:42:54 -07:00
mdio_device.c	net: mdio: rename mdio_device reset to reset_gpio	2019-04-18 17:42:54 -07:00
mdio-bcm-iproc.c
mdio-bcm-unimac.c	net: phy: mdio-bcm-unimac: remove redundant !timeout check	2019-03-27 14:27:30 -07:00
mdio-bitbang.c
mdio-boardinfo.c
mdio-boardinfo.h
mdio-cavium.c
mdio-cavium.h
mdio-gpio.c
mdio-hisi-femac.c
mdio-i2c.c
mdio-i2c.h
mdio-moxart.c
mdio-mscc-miim.c
mdio-mux-bcm-iproc.c
mdio-mux-gpio.c
mdio-mux-meson-g12a.c	net: meson: fixup g12a glue ephy id	2019-05-13 09:12:19 -07:00
mdio-mux-mmioreg.c
mdio-mux-multiplexer.c	drivers: net: phy: mdio-mux: Add support for Generic Mux controls	2019-02-27 12:52:20 -08:00
mdio-mux.c
mdio-octeon.c
mdio-sun4i.c
mdio-thunder.c
mdio-xgene.c
mdio-xgene.h
meson-gxl.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
micrel.c	net: phy: micrel: make sure the factory test bit is cleared	2019-04-29 23:17:21 -04:00
microchip_t1.c
microchip.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
mscc.c	net: phy: mscc: add support for VSC8514 PHY.	2019-04-23 10:47:58 -07:00
national.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
nxp-tja11xx.c	net: phy: tja11xx: Switch to HWMON_CHANNEL_INFO()	2019-05-29 22:02:18 -07:00
phy_device.c	net: phy: enable interrupts when PHY is attached already	2019-05-30 15:02:33 -07:00
phy_led_triggers.c
phy-c45.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
phy-core.c	net: phy: Add support for 100BaseT1 and 1000BaseT1	2019-05-22 17:46:28 -07:00
phy.c	net: phy: export phy_queue_state_machine	2019-05-30 15:02:33 -07:00
phylink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-31 10:49:43 -07:00
qsemi.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
realtek.c	net: phy: realtek: Replace phy functions with non-locked version in rtl8211e_config_init()	2019-05-13 09:10:39 -07:00
rockchip.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
sfp-bus.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
sfp.c	net: phy: sfp: enable i2c-bus detection on ACPI based systems	2019-05-30 11:27:47 -07:00
sfp.h	net: sfp: do not probe SFP module before we're attached	2019-02-08 15:11:25 -08:00
smsc.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
spi_ks8995.c	spi: Micrel eth switch: declare missing of table	2019-04-23 10:44:44 -07:00
ste10Xp.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
swphy.c	net: phy: improve auto-neg emulation in swphy	2019-02-24 22:28:15 -08:00
swphy.h
teranetics.c	net: phy: remove gen10g_no_soft_reset	2019-03-03 21:47:57 -08:00
uPD60620.c	net: phy: switch drivers to use dynamic feature detection	2019-04-15 17:19:54 -07:00
vitesse.c	net: phy: vitesse: Remove support for VSC8514.	2019-04-23 10:47:58 -07:00
xilinx_gmii2rgmii.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-20 00:34:07 -08:00