Skip to contentSkip to conversation

linux-next: build failure after merge of the ecryptfs tree

PATCH In review Stephen Rothwell 5 participants 22 messages May 14, 2019 – Jun 9, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

Hi all,

I don't know why this suddenly appeared after mergeing the ecryptfs tree since nothin has changed in that tree for some time (and nothing in that tree seems relevant).

After merging the ecryptfs tree, today's linux-next build (x86_64 allmodconfig) failed like this:

scripts/Makefile.modpost:112: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:113: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:100: warning: ignoring old recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:127: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:128: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:113: warning: ignoring old recipe for target '.tmp_versions/asix.mod' make[2]: Circular .tmp_versions/asix.mod <- __modpost dependency dropped. Binary file .tmp_versions/asix.mod matches: No such file or directory
make[2]: *** [scripts/Makefile.modpost:91: __modpost] Error 1
make[1]: *** [Makefile:1290: modules] Error 2

The only clue I can see is that asix.o gets built in two separate directories (drivers/net/{phy,usb}).

I have the following files in the object directory:

./.tmp_versions/asix.mod
./drivers/net/usb/asix.ko
./drivers/net/usb/asix.mod.o
./drivers/net/usb/asix.o
./drivers/net/usb/asix_common.o
./drivers/net/usb/asix_devices.o
./drivers/net/usb/.asix.ko.cmd
./drivers/net/usb/.asix.mod.o.cmd
./drivers/net/usb/.asix.o.cmd
./drivers/net/usb/asix.mod.c
./drivers/net/usb/.asix_common.o.cmd
./drivers/net/usb/.asix_devices.o.cmd
./drivers/net/phy/asix.ko
./drivers/net/phy/asix.o
./drivers/net/phy/.asix.ko.cmd
./drivers/net/phy/.asix.mod.o.cmd
./drivers/net/phy/asix.mod.o
./drivers/net/phy/asix.mod.c
./drivers/net/phy/.asix.o.cmd

./.tmp_versions/asix.mod

Looks like this:

------------------------------------------
drivers/net/phy/asix.ko
drivers/net/phy/asix.o

------------------------------------------

What you can't see above are the 256 NUL bytes at the end of the file (followed by a NL).

This is from a -j 80 build. Surely there is a race condition here if the file in .tmp_versions is only named for the base name of the module and we have 2 modules with the same base name.

I removed that file and redid the build and it succeeded.

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Puzzled ... :-(

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw

Hi Stephen,

Quoted 21 lines · Stephen Rothwell

Hi all,

I don't know why this suddenly appeared after mergeing the ecryptfs tree since nothin has changed in that tree for some time (and nothing in that tree seems relevant).

After merging the ecryptfs tree, today's linux-next build (x86_64 allmodconfig) failed like this:

scripts/Makefile.modpost:112: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:113: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:100: warning: ignoring old recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:127: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:128: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:113: warning: ignoring old recipe for target '.tmp_versions/asix.mod' make[2]: Circular .tmp_versions/asix.mod <- __modpost dependency dropped. Binary file .tmp_versions/asix.mod matches: No such file or directory
make[2]: *** [scripts/Makefile.modpost:91: __modpost] Error 1
make[1]: *** [Makefile:1290: modules] Error 2

Quoted 2 lines

The only clue I can see is that asix.o gets built in two separate directories (drivers/net/{phy,usb}).

Module name should be unique.

If both are compiled as a module,
they have the same module names:

drivers/net/phy/asix.ko
drivers/net/usb/asix.ko

If you see .tmp_version directory,
you will see asix.mod

Perhaps, one overwrote the other,
or it already got broken somehow.

Thanks.

Quoted 53 lines

I have the following files in the object directory:

./.tmp_versions/asix.mod
./drivers/net/usb/asix.ko
./drivers/net/usb/asix.mod.o
./drivers/net/usb/asix.o
./drivers/net/usb/asix_common.o
./drivers/net/usb/asix_devices.o
./drivers/net/usb/.asix.ko.cmd
./drivers/net/usb/.asix.mod.o.cmd
./drivers/net/usb/.asix.o.cmd
./drivers/net/usb/asix.mod.c
./drivers/net/usb/.asix_common.o.cmd
./drivers/net/usb/.asix_devices.o.cmd
./drivers/net/phy/asix.ko
./drivers/net/phy/asix.o
./drivers/net/phy/.asix.ko.cmd
./drivers/net/phy/.asix.mod.o.cmd
./drivers/net/phy/asix.mod.o
./drivers/net/phy/asix.mod.c
./drivers/net/phy/.asix.o.cmd

./.tmp_versions/asix.mod

Looks like this:

------------------------------------------
drivers/net/phy/asix.ko
drivers/net/phy/asix.o

------------------------------------------

What you can't see above are the 256 NUL bytes at the end of the file (followed by a NL).

This is from a -j 80 build. Surely there is a race condition here if the file in .tmp_versions is only named for the base name of the module and we have 2 modules with the same base name.

I removed that file and redid the build and it succeeded.

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Puzzled ... :-(

--
Cheers,
Stephen Rothwell

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw

Hi all,

[excessive quoting for new CC's]

Quoted 29 lines · On Tue, 14 May 2019 09:40:53 +0900 Masahiro Yamada…
Quoted 19 lines · Stephen Rothwell

I don't know why this suddenly appeared after mergeing the ecryptfs tree since nothin has changed in that tree for some time (and nothing in that tree seems relevant).

After merging the ecryptfs tree, today's linux-next build (x86_64 allmodconfig) failed like this:

scripts/Makefile.modpost:112: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:113: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:100: warning: ignoring old recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:127: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:128: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:113: warning: ignoring old recipe for target '.tmp_versions/asix.mod' make[2]: Circular .tmp_versions/asix.mod <- __modpost dependency dropped. Binary file .tmp_versions/asix.mod matches: No such file or directory
make[2]: *** [scripts/Makefile.modpost:91: __modpost] Error 1
make[1]: *** [Makefile:1290: modules] Error 2

Quoted 2 lines

The only clue I can see is that asix.o gets built in two separate directories (drivers/net/{phy,usb}).

Module name should be unique.

If both are compiled as a module,
they have the same module names:

Quoted 8 lines

drivers/net/phy/asix.ko
drivers/net/usb/asix.ko

If you see .tmp_version directory,
you will see asix.mod

Perhaps, one overwrote the other,
or it already got broken somehow.

So, the latter of these drivers (drivers/net/phy/asix.c) was added in v4.18-rc1 by commit

31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

If we can't have 2 modules with the same base name, is it too late to change its name?

I am sort of suprised that noone else has hit this in the past year.

Quoted 49 lines
Quoted 49 lines

I have the following files in the object directory:

./.tmp_versions/asix.mod
./drivers/net/usb/asix.ko
./drivers/net/usb/asix.mod.o
./drivers/net/usb/asix.o
./drivers/net/usb/asix_common.o
./drivers/net/usb/asix_devices.o
./drivers/net/usb/.asix.ko.cmd
./drivers/net/usb/.asix.mod.o.cmd
./drivers/net/usb/.asix.o.cmd
./drivers/net/usb/asix.mod.c
./drivers/net/usb/.asix_common.o.cmd
./drivers/net/usb/.asix_devices.o.cmd
./drivers/net/phy/asix.ko
./drivers/net/phy/asix.o
./drivers/net/phy/.asix.ko.cmd
./drivers/net/phy/.asix.mod.o.cmd
./drivers/net/phy/asix.mod.o
./drivers/net/phy/asix.mod.c
./drivers/net/phy/.asix.o.cmd

./.tmp_versions/asix.mod

Looks like this:

------------------------------------------
drivers/net/phy/asix.ko
drivers/net/phy/asix.o

------------------------------------------

What you can't see above are the 256 NUL bytes at the end of the file (followed by a NL).

This is from a -j 80 build. Surely there is a race condition here if the file in .tmp_versions is only named for the base name of the module and we have 2 modules with the same base name.

I removed that file and redid the build and it succeeded.

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Puzzled ... :-(

Signature · 2 lines
Cheers,
Stephen Rothwell
#3 lore raw

Stephen,

I wasn't aware of the other asix module when submitting the phy driver. The phy module gets autoloaded based on the PHY ID, so there's no reason why it couldn't be renamed.

May I suggest ax88796b for the new module name?

Cheers,

    Michael

Quoted 98 lines · Stephen Rothwell

Hi all,

[excessive quoting for new CC's]

Quoted 26 lines · On Tue, 14 May 2019 09:40:53 +0900 Masahiro Yamada…
Quoted 18 lines · Stephen Rothwell

I don't know why this suddenly appeared after mergeing the ecryptfs tree since nothin has changed in that tree for some time (and nothing in that tree seems relevant).

After merging the ecryptfs tree, today's linux-next build (x86_64 allmodconfig) failed like this:

scripts/Makefile.modpost:112: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:113: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:100: warning: ignoring old recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:127: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:128: warning: overriding recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:113: warning: ignoring old recipe for target '.tmp_versions/asix.mod' make[2]: Circular .tmp_versions/asix.mod <- __modpost dependency dropped. Binary file .tmp_versions/asix.mod matches: No such file or directory
make[2]: *** [scripts/Makefile.modpost:91: __modpost] Error 1
make[1]: *** [Makefile:1290: modules] Error 2

Quoted 2 lines

The only clue I can see is that asix.o gets built in two separate directories (drivers/net/{phy,usb}).

Module name should be unique.

If both are compiled as a module,
they have the same module names:

Quoted 8 lines

drivers/net/phy/asix.ko
drivers/net/usb/asix.ko

If you see .tmp_version directory,
you will see asix.mod

Perhaps, one overwrote the other,
or it already got broken somehow.

So, the latter of these drivers (drivers/net/phy/asix.c) was added in v4.18-rc1 by commit

31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

If we can't have 2 modules with the same base name, is it too late to change its name?

I am sort of suprised that noone else has hit this in the past year.

Quoted 49 lines
Quoted 49 lines

I have the following files in the object directory:

./.tmp_versions/asix.mod
./drivers/net/usb/asix.ko
./drivers/net/usb/asix.mod.o
./drivers/net/usb/asix.o
./drivers/net/usb/asix_common.o
./drivers/net/usb/asix_devices.o
./drivers/net/usb/.asix.ko.cmd
./drivers/net/usb/.asix.mod.o.cmd
./drivers/net/usb/.asix.o.cmd
./drivers/net/usb/asix.mod.c
./drivers/net/usb/.asix_common.o.cmd
./drivers/net/usb/.asix_devices.o.cmd
./drivers/net/phy/asix.ko
./drivers/net/phy/asix.o
./drivers/net/phy/.asix.ko.cmd
./drivers/net/phy/.asix.mod.o.cmd
./drivers/net/phy/asix.mod.o
./drivers/net/phy/asix.mod.c
./drivers/net/phy/.asix.o.cmd

./.tmp_versions/asix.mod

Looks like this:

------------------------------------------
drivers/net/phy/asix.ko
drivers/net/phy/asix.o

------------------------------------------

What you can't see above are the 256 NUL bytes at the end of the file (followed by a NL).

This is from a -j 80 build. Surely there is a race condition here if the file in .tmp_versions is only named for the base name of the module and we have 2 modules with the same base name.

I removed that file and redid the build and it succeeded.

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Puzzled ... :-(

#4 lore raw

Hi,

Am 14.05.2019 um 13:22 schrieb Michael Schmitz:

Quoted 7 lines

Stephen,

I wasn't aware of the other asix module when submitting the phy driver. The phy module gets autoloaded based on the PHY ID, so there's no reason why it couldn't be renamed.

May I suggest ax88796b for the new module name?

I've got a patch series ready to go for this (compile tested).

I suppose this is meant to go through the net tree, Dave?

Cheers,

Michael

Quoted 118 lines

Cheers,

Michael

Quoted 110 lines · Stephen Rothwell

Hi all,

[excessive quoting for new CC's]

Quoted 36 lines · On Tue, 14 May 2019 09:40:53 +0900 Masahiro Yamada…
Quoted 27 lines · Stephen Rothwell

I don't know why this suddenly appeared after mergeing the ecryptfs tree
since nothin has changed in that tree for some time (and nothing in that
tree seems relevant).

After merging the ecryptfs tree, today's linux-next build (x86_64 allmodconfig) failed like this:

scripts/Makefile.modpost:112: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:113: warning: overriding recipe for target '.tmp_versions/asix.mod'
scripts/Makefile.modpost:100: warning: ignoring old recipe for target '.tmp_versions/asix.mod' scripts/Makefile.modpost:127: target '.tmp_versions/asix.mod' doesn't match the target pattern scripts/Makefile.modpost:128: warning: overriding recipe for target '.tmp_versions/asix.mod'
scripts/Makefile.modpost:113: warning: ignoring old recipe for target '.tmp_versions/asix.mod'
make[2]: Circular .tmp_versions/asix.mod <- __modpost dependency dropped.
Binary file .tmp_versions/asix.mod matches: No such file or directory make[2]: *** [scripts/Makefile.modpost:91: __modpost] Error 1 make[1]: *** [Makefile:1290: modules] Error 2

Quoted 2 lines

The only clue I can see is that asix.o gets built in two separate directories (drivers/net/{phy,usb}).

Module name should be unique.

If both are compiled as a module,
they have the same module names:

Quoted 8 lines

drivers/net/phy/asix.ko
drivers/net/usb/asix.ko

If you see .tmp_version directory,
you will see asix.mod

Perhaps, one overwrote the other,
or it already got broken somehow.

So, the latter of these drivers (drivers/net/phy/asix.c) was added in v4.18-rc1 by commit

31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

If we can't have 2 modules with the same base name, is it too late to change its name?

I am sort of suprised that noone else has hit this in the past year.

Quoted 50 lines
Quoted 50 lines

I have the following files in the object directory:

./.tmp_versions/asix.mod
./drivers/net/usb/asix.ko
./drivers/net/usb/asix.mod.o
./drivers/net/usb/asix.o
./drivers/net/usb/asix_common.o
./drivers/net/usb/asix_devices.o
./drivers/net/usb/.asix.ko.cmd
./drivers/net/usb/.asix.mod.o.cmd
./drivers/net/usb/.asix.o.cmd
./drivers/net/usb/asix.mod.c
./drivers/net/usb/.asix_common.o.cmd
./drivers/net/usb/.asix_devices.o.cmd
./drivers/net/phy/asix.ko
./drivers/net/phy/asix.o
./drivers/net/phy/.asix.ko.cmd
./drivers/net/phy/.asix.mod.o.cmd
./drivers/net/phy/asix.mod.o
./drivers/net/phy/asix.mod.c
./drivers/net/phy/.asix.o.cmd

./.tmp_versions/asix.mod

Looks like this:

------------------------------------------
drivers/net/phy/asix.ko
drivers/net/phy/asix.o

------------------------------------------

What you can't see above are the 256 NUL bytes at the end of the file (followed by a NL).

This is from a -j 80 build. Surely there is a race condition here if the
file in .tmp_versions is only named for the base name of the module and we have 2 modules with the same base name.

I removed that file and redid the build and it succeeded.

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Puzzled ... :-(

#5 lore raw

cover resolve module name conflict for asix PHY and USB modules

In reply to Stephen Rothwell

Haven't heard back in a while, so here goes:

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.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

Michael Schmitz (3):
net: phy: new ax88796b.c Asix Electronics PHY driver
net: 8390: switch X-Surf 100 driver to use ax88796b PHY
net: phy: remove old Asix Electronics PHY driver

 drivers/net/ethernet/8390/Kconfig |  2 +-
 drivers/net/phy/Kconfig           |  2 +-
 drivers/net/phy/Makefile          |  2 +-
 drivers/net/phy/asix.c            | 57 ---------------------------------------
 drivers/net/phy/ax88796b.c        | 57 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 drivers/net/phy/asix.c
 create mode 100644 drivers/net/phy/ax88796b.c
Signature · 1 line
1.9.1
#6 lore raw

PATCH 1/3 net: phy: new ax88796b.c Asix Electronics PHY driver

The asix.c driver name causes a module name conflict with a driver of the same name in drivers/net/usb. Add new ax88796b.c driver to prepare for removal of drivers/net/phy/asix.c later.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
---
 drivers/net/phy/Kconfig    |  6 +++++
 drivers/net/phy/Makefile   |  1 +
 drivers/net/phy/ax88796b.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
drivers/net/phy/Kconfig +6 -0
index d629971..1647473 100644
@@ -259,6 +259,12 @@ config ASIX_PHY
 	  Currently supports the Asix Electronics PHY found in the X-Surf 100
 	  AX88796B package.
 
+config AX88796B_PHY
+	tristate "Asix PHYs"
+	help
+	  Currently supports the Asix Electronics PHY found in the X-Surf 100
+	  AX88796B package.
+
 config AT803X_PHY
 	tristate "AT803X PHYs"
 	---help---
drivers/net/phy/Makefile +1 -0
index 27d7f9f..cc5758a 100644
@@ -53,6 +53,7 @@ aquantia-objs			+= aquantia_hwmon.o
 endif
 obj-$(CONFIG_AQUANTIA_PHY)	+= aquantia.o
 obj-$(CONFIG_ASIX_PHY)		+= asix.o
+obj-$(CONFIG_AX88796B_PHY)	+= ax88796b.o
 obj-$(CONFIG_AT803X_PHY)	+= at803x.o
 obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
 obj-$(CONFIG_BCM7XXX_PHY)	+= bcm7xxx.o
drivers/net/phy/ax88796b.c new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.9.1
#7 lore raw

PATCH 2/3 net: 8390: switch X-Surf 100 driver to use ax88796b PHY

In reply to Michael Schmitz

The asix.c driver name causes a module name conflict with a driver of the same name in drivers/net/usb. Select the new ax88796b PHY driver when X-SURF 100 support is configured.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
---
 drivers/net/ethernet/8390/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/8390/Kconfig +1 -1
index f2f0264..443b34e 100644
@@ -49,7 +49,7 @@ config XSURF100
 	tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
 	depends on ZORRO
 	select AX88796
-	select ASIX_PHY
+	select AX88796B_PHY
 	help
 	  This driver is for the Individual Computers X-Surf 100 Ethernet
 	  card (based on the Asix AX88796 chip). If you have such a card,
Signature · 1 line
1.9.1
#8 lore raw

PATCH 3/3 net: phy: remove old Asix Electronics PHY driver

In reply to Michael Schmitz

The asix.c driver name causes a module name conflict with a driver of the same name in drivers/net/usb. Now that a new ax88796b.c driver has been added, remove drivers/net/phy/asix.c.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
---
 drivers/net/phy/Kconfig  |  6 -----
 drivers/net/phy/Makefile |  1 -
 drivers/net/phy/asix.c   | 57 ------------------------------------------------
 3 files changed, 64 deletions(-)
drivers/net/phy/Kconfig +0 -6
index 1647473..5496e5c 100644
@@ -253,12 +253,6 @@ config AQUANTIA_PHY
 	---help---
 	  Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
 
-config ASIX_PHY
-	tristate "Asix PHYs"
-	help
-	  Currently supports the Asix Electronics PHY found in the X-Surf 100
-	  AX88796B package.
-
 config AX88796B_PHY
 	tristate "Asix PHYs"
 	help
drivers/net/phy/Makefile +0 -1
index cc5758a..5b5c866 100644
@@ -52,7 +52,6 @@ ifdef CONFIG_HWMON
 aquantia-objs			+= aquantia_hwmon.o
 endif
 obj-$(CONFIG_AQUANTIA_PHY)	+= aquantia.o
-obj-$(CONFIG_ASIX_PHY)		+= asix.o
 obj-$(CONFIG_AX88796B_PHY)	+= ax88796b.o
 obj-$(CONFIG_AT803X_PHY)	+= at803x.o
 obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
drivers/net/phy/asix.c deleted +0 -57

57 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer
#9 lore raw

Re: [PATCH 0/3] resolve module name conflict for asix PHY and USB modules

In reply to Michael Schmitz
Quoted 10 lines · Michael Schmitz

Haven't heard back in a while, so here goes:

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.

Hi Michael

Please just use git mv and do it all one patch. It then makes it clear you have not changed the driver, just renamed it.

Thanks
Andrew

#10 lore raw

Re: [PATCH 0/3] resolve module name conflict for asix PHY and USB modules

Thanks Andrew,

makes perfect sense - patch resent.

Cheers,

Michael

Am 18.05.2019 um 09:20 schrieb Andrew Lunn:

Quoted 20 lines · Michael Schmitz
Quoted 10 lines

Haven't heard back in a while, so here goes:

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.

Hi Michael

Please just use git mv and do it all one patch. It then makes it clear you have not changed the driver, just renamed it.

Thanks
Andrew

#11 lore raw

PATCH v2 1/1 net: phy: rename Asix Electronics PHY driver

In reply to Stephen Rothwell

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.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

---

Changes from v1:

- merge into single commit (suggested by Andrew Lunn)

---
 drivers/net/ethernet/8390/Kconfig |  2 +-
 drivers/net/phy/Kconfig           |  2 +-
 drivers/net/phy/Makefile          |  2 +-
 drivers/net/phy/asix.c            | 57 ---------------------------------------
 drivers/net/phy/ax88796b.c        | 57 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 60 deletions(-)
drivers/net/ethernet/8390/Kconfig +1 -1
index f2f0264..443b34e 100644
@@ -49,7 +49,7 @@ config XSURF100
 	tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
 	depends on ZORRO
 	select AX88796
-	select ASIX_PHY
+	select AX88796B_PHY
 	help
 	  This driver is for the Individual Computers X-Surf 100 Ethernet
 	  card (based on the Asix AX88796 chip). If you have such a card,
drivers/net/phy/Kconfig +1 -1
index d629971..5496e5c 100644
@@ -253,7 +253,7 @@ config AQUANTIA_PHY
 	---help---
 	  Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
 
-config ASIX_PHY
+config AX88796B_PHY
 	tristate "Asix PHYs"
 	help
 	  Currently supports the Asix Electronics PHY found in the X-Surf 100
drivers/net/phy/Makefile +1 -1
index 27d7f9f..5b5c866 100644
@@ -52,7 +52,7 @@ ifdef CONFIG_HWMON
 aquantia-objs			+= aquantia_hwmon.o
 endif
 obj-$(CONFIG_AQUANTIA_PHY)	+= aquantia.o
-obj-$(CONFIG_ASIX_PHY)		+= asix.o
+obj-$(CONFIG_AX88796B_PHY)	+= ax88796b.o
 obj-$(CONFIG_AT803X_PHY)	+= at803x.o
 obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
 obj-$(CONFIG_BCM7XXX_PHY)	+= bcm7xxx.o
drivers/net/phy/asix.c deleted +0 -57

57 lines not on this page · raw message

drivers/net/phy/ax88796b.c new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer
#12 lore raw

Re: [PATCH v2] net: phy: rename Asix Electronics PHY driver

Quoted 9 lines · Michael Schmitz

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.

Quoted 7 lines
Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

---

Changes from v1:

- merge into single commit (suggested by Andrew Lunn)

Hi Michael

There is a flag you can pass to git which will make it issue a rename, rather than delete and then add. That will make the patch much smaller.

net-next is closed at the moment.

http://vger.kernel.org/~davem/net-next.html

Once it reopens, please send a v3, and it will be merged.

Thanks
Andrew

#13 lore raw

Re: [PATCH v2] net: phy: rename Asix Electronics PHY driver

Hi Andrew,

Am 19.05.2019 um 02:20 schrieb Andrew Lunn:

Quoted 16 lines · Michael Schmitz
Quoted 15 lines

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.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

---

Changes from v1:

Quoted 7 lines
Quoted 1 line

- merge into single commit (suggested by Andrew Lunn)

Hi Michael

There is a flag you can pass to git which will make it issue a rename, rather than delete and then add. That will make the patch much smaller.

Thanks, will do.

Quoted 1 line

net-next is closed at the moment.

My apologies - I had hoped that as a bugfix. this could go straight to net.

Cheers,

Michael

Quoted 8 lines

http://vger.kernel.org/~davem/net-next.html

Once it reopens, please send a v3, and it will be merged.

Thanks
Andrew

maintainer
#14 lore raw

Re: [PATCH v2] net: phy: rename Asix Electronics PHY driver

Quoted 1 line

My apologies - I had hoped that as a bugfix. this could go straight to net.

Ah, O.K. You then need to put "PATCH net" to make it clear this is for net.

Andrew

#15 lore raw

PATCH v3 1/1 net: phy: rename Asix Electronics PHY driver

In reply to Stephen Rothwell

[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.

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)

---
 drivers/net/ethernet/8390/Kconfig      | 2 +-
 drivers/net/phy/Kconfig                | 2 +-
 drivers/net/phy/Makefile               | 2 +-
 drivers/net/phy/{asix.c => ax88796b.c} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/8390/Kconfig +1 -1
index f2f0264..443b34e 100644
@@ -49,7 +49,7 @@ config XSURF100
 	tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
 	depends on ZORRO
 	select AX88796
-	select ASIX_PHY
+	select AX88796B_PHY
 	help
 	  This driver is for the Individual Computers X-Surf 100 Ethernet
 	  card (based on the Asix AX88796 chip). If you have such a card,
drivers/net/phy/Kconfig +1 -1
index d629971..5496e5c 100644
@@ -253,7 +253,7 @@ config AQUANTIA_PHY
 	---help---
 	  Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
 
-config ASIX_PHY
+config AX88796B_PHY
 	tristate "Asix PHYs"
 	help
 	  Currently supports the Asix Electronics PHY found in the X-Surf 100
drivers/net/phy/Makefile +1 -1
index 27d7f9f..5b5c866 100644
@@ -52,7 +52,7 @@ ifdef CONFIG_HWMON
 aquantia-objs			+= aquantia_hwmon.o
 endif
 obj-$(CONFIG_AQUANTIA_PHY)	+= aquantia.o
-obj-$(CONFIG_ASIX_PHY)		+= asix.o
+obj-$(CONFIG_AX88796B_PHY)	+= ax88796b.o
 obj-$(CONFIG_AT803X_PHY)	+= at803x.o
 obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
 obj-$(CONFIG_BCM7XXX_PHY)	+= bcm7xxx.o
drivers/net/phy/ax88796b.c renamed from drivers/net/phy/asix.c +0 -0
similarity index 100%
rename from drivers/net/phy/asix.c
rename to drivers/net/phy/ax88796b.c
Signature · 1 line
1.9.1
maintainer Reviewed-by on v3 1/1
#16 lore raw

Re: [PATCH net v3] net: phy: rename Asix Electronics PHY driver

Quoted 7 lines · Michael Schmitz

[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).

Quoted 8 lines

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.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

Andrew

#17 lore raw

Re: [PATCH net v3] net: phy: rename Asix Electronics PHY driver

Am 08.06.2019 um 01:00 schrieb Andrew Lunn:

Quoted 11 lines · Michael Schmitz
Quoted 10 lines

[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.

Quoted 7 lines
Quoted 5 lines

Rename PHY driver to ax88796b.c in order to resolve name conflict.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

Thanks for your review, Andrew.

Which reminds me - I had submitted two patches as cleanup for the xsurf100.c driver that would allow us to drop including lib8390.c there. The patches were reviewed by Geert but never picked up by Dave.

The card-specific block_output function provided by the xsurf100.c driver needs to execute reset_8380() when transfers get stuffed up. According to the comment at the head of lib8390.c, a reset must always be followed by a call to __NS8390_init(), so this function is also needed by our block_output. The current xsurf100.c includes lib8390.c just for the benefit of that single function.

My solution was to export ax_8390_init() through a public wrapper, but that didn't find favour, apparently. The only other solution I can see would be to add an init_8380 function pointer to the ei_device struct, but as init_8390 isn't really board specific, that would be abusing ei_device a little, no?

Any feedback welcome.

Cheers,

Michael

Quoted 3 lines

Andrew

maintainer Applied
#18 lore raw

Re: [PATCH net v3] net: phy: rename Asix Electronics PHY driver

In reply to Michael Schmitz

From: Michael Schmitz <[email protected]>
Date: Fri, 7 Jun 2019 17:37:34 +1200

Quoted 17 lines

[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.

Fixes 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")

---

Quoted 7 lines

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.

#19 lore raw
In reply to Masahiro Yamada

Hi Masahiro,

Also, this:

Quoted 6 lines · On Tue, 14 May 2019 09:40:53 +0900 Masahiro Yamada…
Quoted 6 lines

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Its a bit annoying that the module was even being looked at given nothing it files depend upon had been modified.

Signature · 2 lines
Cheers,
Stephen Rothwell
#20 lore raw

Hi Stephen,

Quoted 7 lines · Stephen Rothwell

Hi Masahiro,

Also, this:

Quoted 1 line · On Tue, 14 May 2019 09:40:53 +0900 Masahiro Yamada…
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines

Mind you, I have no itdea why this file was begin rebuilt, the merge only touched these files:

fs/ecryptfs/crypto.c
fs/ecryptfs/keystore.c

Its a bit annoying that the module was even being looked at given nothing it files depend upon had been modified.

If you are talking about the rebuild of
.tmp_versions/*.mod files,
yes, they are cleaned up every time.

# Create temporary dir for module support files

# clean it up only when building all modules
cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \
                  $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*)

I think the reason is that
we want to make sure stale modules are not remaining when CONFIG_MY_DRIVER=m is turned into CONFIG_MY_DRIVER=n

Rebuilding .mod files is not expensive.

I think this behavior can be improved, but that is how it has been working for a long time.

--
Best Regards
Masahiro Yamada

#21 lore raw

Hi Masahiro,

Quoted 16 lines · On Tue, 14 May 2019 13:16:37 +0900 Masahiro Yamada…

If you are talking about the rebuild of
.tmp_versions/*.mod files,
yes, they are cleaned up every time.

# Create temporary dir for module support files

# clean it up only when building all modules
cmd_crmodverdir = $(Q)mkdir -p $(MODVERDIR) \
                  $(if $(KBUILD_MODULES),; rm -f $(MODVERDIR)/*)

I think the reason is that
we want to make sure stale modules are not remaining when CONFIG_MY_DRIVER=m is turned into CONFIG_MY_DRIVER=n

Quoted 4 lines

Rebuilding .mod files is not expensive.

I think this behavior can be improved, but that is how it has been working for a long time.

when you say "not expensive", how long is that? Because an x86_64 allmodconfig build currently produces 7313 of those files, so at .01 seconds each (for example) that would add over a minute to each of my builds ... and I do lots of builds every day. OK, so it may not be that significant (so a millisecond each is obviously not a problem), but just wondering if it can be avoided.

Signature · 2 lines
Cheers,
Stephen Rothwell