David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-12-20 11:53:36 -08:00

..

amd.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

aquantia.c

net: ethernet: Convert phydev advertize and supported from u32 to link mode

2018-11-11 10:10:01 -08:00

asix.c

…

at803x.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

bcm7xxx.c

net: phy: bcm7xxx: Add entry for BCM7255

2018-11-07 21:50:27 -08:00

bcm63xx.c

net: ethernet: Convert phydev advertize and supported from u32 to link mode

2018-11-11 10:10:01 -08:00

bcm87xx.c

net: ethernet: Convert phydev advertize and supported from u32 to link mode

2018-11-11 10:10:01 -08:00

bcm-cygnus.c

…

bcm-phy-lib.c

…

bcm-phy-lib.h

…

broadcom.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-11-11 17:57:54 -08:00

cicada.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

cortina.c

…

davicom.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

dp83tc811.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

dp83640_reg.h

…

dp83640.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

dp83822.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

dp83848.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

dp83867.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

et1011c.c

…

fixed_phy.c

Fixed PHY: Add fixed_phy_change_carrier()

2018-12-17 11:24:32 -08:00

icplus.c

net: phy: icplus: allow configuring the interrupt function on IP101GR

2018-11-18 16:16:20 -08:00

intel-xway.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

Kconfig

…

lxt.c

net: phy: Convert u32 phydev->lp_advertising to linkmode

2018-11-11 10:10:01 -08:00

Makefile

…

marvell10g.c

net: mii: Rename mii_stat1000_to_linkmode_lpa_t

2018-12-05 16:26:16 -08:00

marvell.c

phy: marvell: Rename mii_lpa_to_linkmode_lpa_t

2018-12-05 16:26:16 -08:00

mdio_bus.c

…

mdio_device.c

…

mdio-bcm-iproc.c

…

mdio-bcm-unimac.c

…

mdio-bitbang.c

…

mdio-boardinfo.c

…

mdio-boardinfo.h

…

mdio-cavium.c

…

mdio-cavium.h

…

mdio-gpio.c

net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data

2018-12-08 21:33:30 -08:00

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-mmioreg.c

…

mdio-mux.c

…

mdio-octeon.c

…

mdio-sun4i.c

…

mdio-thunder.c

…

mdio-xgene.c

…

mdio-xgene.h

…

meson-gxl.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

micrel.c

phy: Revert toggling reset changes.

2018-12-04 08:47:44 -08:00

microchip_t1.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

microchip.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

mscc.c

net: phy: mscc: Fix the VSC 8531/41 Chip Init sequence

2018-12-19 10:33:25 -08:00

national.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

phy_device.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-12-20 11:53:36 -08:00

phy_led_triggers.c

net: phy: leds: Don't make our own link speed names

2018-11-09 20:13:51 -08:00

phy-c45.c

net: phy: Convert u32 phydev->lp_advertising to linkmode

2018-11-11 10:10:01 -08:00

phy-core.c

net: phy: Add support for resolving 5G and 2.5G autoneg

2018-11-11 10:10:02 -08:00

phy.c

net: phy: print stack trace in phy_error

2018-12-18 15:11:46 -08:00

phylink.c

net: ethernet: Convert phydev advertize and supported from u32 to link mode

2018-11-11 10:10:01 -08:00

qsemi.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

realtek.c

net: phy: realtek: use new PHYID matching macros

2018-11-11 09:44:14 -08:00

rockchip.c

…

sfp-bus.c

net: phy: sfp: correct store of detected link modes

2018-11-29 10:47:44 -08:00

sfp.c

…

sfp.h

…

smsc.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

spi_ks8995.c

…

ste10Xp.c

net: phy: remove flag PHY_HAS_INTERRUPT from driver configs

2018-11-11 09:36:56 -08:00

swphy.c

…

swphy.h

…

teranetics.c

…

uPD60620.c

net: phy: Convert u32 phydev->lp_advertising to linkmode

2018-11-11 10:10:01 -08:00

vitesse.c

net: phy: vitesse: remove duplicate support for VSC8574

2018-11-23 17:25:32 -08:00

xilinx_gmii2rgmii.c

…