From: Michael Schmitz <schmitz...@gmail.com> Date: Fri, 7 Jun 2019 17:37:34 +1200
> [Resent to net instead of net-next - may clash with Anders Roxell's patch > series addressing duplicate module names] > > Commit 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver") > introduced a new PHY driver drivers/net/phy/asix.c that causes a module > name conflict with a pre-existiting driver (drivers/net/usb/asix.c). > > The PHY driver is used by the X-Surf 100 ethernet card driver, and loaded > by that driver via its PHY ID. A rename of the driver looks unproblematic. > > Rename PHY driver to ax88796b.c in order to resolve name conflict. > > Signed-off-by: Michael Schmitz <schmitz...@gmail.com> > Tested-by: Michael Schmitz <schmitz...@gmail.com> > Fixes: 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver") > --- > > Changes from v1: > > - merge into single commit (suggested by Andrew Lunn) > > Changes from v2: > > - use rename flag for diff (suggested by Andrew Lunn) Applied, thanks.