Skip to contentSkip to conversation

linux-next: build warning after merge of the vfs tree

PATCH In review Stephen Rothwell 5 participants 7 messages Mar 9, 2020 – Mar 11, 2020

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

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

warning: same module names found:
fs/exfat/exfat.ko
drivers/staging/exfat/exfat.ko

Introduced by commit

b9d1e2e6265f ("exfat: add Kconfig and Makefile")

and not fixed by commit

1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")

$ grep EXFAT .config
CONFIG_STAGING_EXFAT_FS=m
CONFIG_STAGING_EXFAT_DISCARD=y
CONFIG_STAGING_EXFAT_DELAYED_SYNC=y
CONFIG_STAGING_EXFAT_KERNEL_DEBUG=y
CONFIG_STAGING_EXFAT_DEBUG_MSG=y
CONFIG_STAGING_EXFAT_DEFAULT_CODEPAGE=437
CONFIG_STAGING_EXFAT_DEFAULT_IOCHARSET="utf8"
# DOS/FAT/EXFAT/NT Filesystems
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# end of DOS/FAT/EXFAT/NT Filesystems
Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 9 lines · On Tuesday 10 March 2020 09:59:18 Stephen Rothwell wrote:

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

warning: same module names found:
fs/exfat/exfat.ko
drivers/staging/exfat/exfat.ko

Quoted 7 lines

Introduced by commit

b9d1e2e6265f ("exfat: add Kconfig and Makefile")

and not fixed by commit

1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")

Hello Stephen!

exfat.ko from fs/exfat subdirectory is a rewrite/cleanup of staging exfat driver. It means that fs/exfat replaces staging/exfat and so after fs/exfat is merged, the old staging/exfat code is not needed anymore.

Therefore I think that instead of hacking Kconfig/Makefile files to define mutually exclusivity, it is better to remove staging/exfat code.

Removal of old staging code should be easy and should fix this problem.

Any objections? Or other ideas?

#2 lore raw
Quoted 21 lines · On Tuesday 10 March 2020 09:59:18 Stephen Rothwell wrote:
Quoted 9 lines

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

warning: same module names found:
fs/exfat/exfat.ko
drivers/staging/exfat/exfat.ko

Quoted 8 lines

Introduced by commit

b9d1e2e6265f ("exfat: add Kconfig and Makefile")

and not fixed by commit

1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat
mutually exclusive")

Hello Stephen!

Quoted 8 lines

exfat.ko from fs/exfat subdirectory is a rewrite/cleanup of staging exfat driver. It means that fs/exfat replaces staging/exfat and so after fs/exfat is merged, the old staging/exfat code is not needed anymore.

Therefore I think that instead of hacking Kconfig/Makefile files to define mutually exclusivity, it is better to remove staging/exfat code.

Removal of old staging code should be easy and should fix this problem.

Agree.
Greg, You told me to let me know when fs/exfat gets accepted. Now it's time to drop staging/exfat.

Thanks!

Quoted 2 lines

Any objections? Or other ideas?

#3 lore raw
Quoted 25 lines · Namjae Jeon
Quoted 25 lines · On Tuesday 10 March 2020 09:59:18 Stephen Rothwell wrote:
Quoted 9 lines

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig) produced this warning:

warning: same module names found:
fs/exfat/exfat.ko
drivers/staging/exfat/exfat.ko

Quoted 8 lines

Introduced by commit

b9d1e2e6265f ("exfat: add Kconfig and Makefile")

and not fixed by commit

1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat
mutually exclusive")

Hello Stephen!

exfat.ko from fs/exfat subdirectory is a rewrite/cleanup of staging exfat driver. It means that fs/exfat replaces staging/exfat and so after fs/exfat is merged, the old staging/exfat code is not needed anymore.

Quoted 7 lines
Quoted 4 lines

Therefore I think that instead of hacking Kconfig/Makefile files to define mutually exclusivity, it is better to remove staging/exfat code.

Removal of old staging code should be easy and should fix this problem.

Agree.
Greg, You told me to let me know when fs/exfat gets accepted. Now it's time to drop staging/exfat.

Wonderful! I'll go drop it right now, thanks for letting me know!

greg k-h

#4 lore raw

PATCH 1/1 staging: exfat: remove staging version of exfat filesystem

In reply to Namjae Jeon

Now that there is a "real" solution for exfat in the vfs tree queued up to be merged in 5.7-rc1 the "old" exfat code in staging can be removed.

Many thanks to Valdis for doing the work to get this into the tree in the first place, it was greatly appreciated.

Cc Valdis Kletnieks <[email protected]>
Cc Pali Rohár <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Al Viro <[email protected]>
Cc Namjae Jeon <[email protected]>
Cc Sungjong Seo <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 MAINTAINERS                          |    6 -
 drivers/staging/Kconfig              |    2 -
 drivers/staging/Makefile             |    1 -
 drivers/staging/exfat/Kconfig        |   41 -
 drivers/staging/exfat/Makefile       |   10 -
 drivers/staging/exfat/TODO           |   69 -
 drivers/staging/exfat/exfat.h        |  760 ------
 drivers/staging/exfat/exfat_blkdev.c |  138 --
 drivers/staging/exfat/exfat_cache.c  |  514 ----
 drivers/staging/exfat/exfat_core.c   | 2529 --------------------
 drivers/staging/exfat/exfat_nls.c    |  212 --
 drivers/staging/exfat/exfat_super.c  | 3296 --------------------------
 drivers/staging/exfat/exfat_upcase.c |  740 ------
 13 files changed, 8318 deletions(-)
 delete mode 100644 drivers/staging/exfat/Kconfig
 delete mode 100644 drivers/staging/exfat/Makefile
 delete mode 100644 drivers/staging/exfat/TODO
 delete mode 100644 drivers/staging/exfat/exfat.h
 delete mode 100644 drivers/staging/exfat/exfat_blkdev.c
 delete mode 100644 drivers/staging/exfat/exfat_cache.c
 delete mode 100644 drivers/staging/exfat/exfat_core.c
 delete mode 100644 drivers/staging/exfat/exfat_nls.c
 delete mode 100644 drivers/staging/exfat/exfat_super.c
 delete mode 100644 drivers/staging/exfat/exfat_upcase.c
MAINTAINERS +0 -6
index 83bf5bcb9466..836f1e262b4e 100644
@@ -6301,12 +6301,6 @@ F:	include/trace/events/mdio.h
 F:	include/uapi/linux/mdio.h
 F:	include/uapi/linux/mii.h
 
-EXFAT FILE SYSTEM
-M:	Valdis Kletnieks <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	drivers/staging/exfat/
-
 EXT2 FILE SYSTEM
 M:	Jan Kara <[email protected]>
 L:	[email protected]
drivers/staging/Kconfig +0 -2
index f46c1f7d0d39..6cb5444776e8 100644
@@ -116,8 +116,6 @@ source "drivers/staging/fieldbus/Kconfig"
 
 source "drivers/staging/kpc2000/Kconfig"
 
-source "drivers/staging/exfat/Kconfig"
-
 source "drivers/staging/qlge/Kconfig"
 
 source "drivers/staging/hp/Kconfig"
drivers/staging/Makefile +0 -1
index bb26d753066c..e7b06e823e91 100644
@@ -48,7 +48,6 @@ obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket/
 obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/
 obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
 obj-$(CONFIG_KPC2000)		+= kpc2000/
-obj-$(CONFIG_STAGING_EXFAT_FS)	+= exfat/
 obj-$(CONFIG_QLGE)		+= qlge/
 obj-$(CONFIG_NET_VENDOR_HP)	+= hp/
 obj-$(CONFIG_WFX)		+= wfx/
drivers/staging/exfat/Kconfig deleted +0 -41

41 lines not on this page · raw message

drivers/staging/exfat/Makefile deleted +0 -10
deleted file mode 100644
index 057556eeca0c..000000000000
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-obj-$(CONFIG_STAGING_EXFAT_FS) += exfat.o
-
-exfat-y :=	exfat_core.o	\
-		exfat_super.o	\
-		exfat_blkdev.o	\
-		exfat_cache.o	\
-		exfat_nls.o	\
-		exfat_upcase.o
drivers/staging/exfat/TODO deleted +0 -69

69 lines not on this page · raw message

drivers/staging/exfat/exfat.h deleted +0 -760

760 lines not on this page · raw message

drivers/staging/exfat/exfat_blkdev.c deleted +0 -138

138 lines not on this page · raw message

drivers/staging/exfat/exfat_cache.c deleted +0 -514

514 lines not on this page · raw message

drivers/staging/exfat/exfat_core.c deleted +0 -2529

1,441 lines not on this page · raw message

drivers/staging/exfat/exfat_nls.c deleted +0 -212

212 lines not on this page · raw message

drivers/staging/exfat/exfat_super.c deleted +0 -3296

3,296 lines not on this page · raw message

drivers/staging/exfat/exfat_upcase.c deleted +0 -740

740 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#5 lore raw

Re: [PATCH] staging: exfat: remove staging version of exfat filesystem

Quoted 7 lines · Greg Kroah-Hartman

Now that there is a "real" solution for exfat in the vfs tree queued up to be merged in 5.7-rc1 the "old" exfat code in staging can be removed.

Many thanks to Valdis for doing the work to get this into the tree in the first place, it was greatly appreciated.

Cc Valdis Kletnieks <[email protected]>

You can stick my Acked-by: on that. :)

And thanks to Namjae Jeon for graciously offering to take it off my hands by providing a better version, and to all the people at Linux Foundation and Microsoft who did a lot of behind the scenes work to make it happen...

Acked-by on v1 1/1
#6 lore raw

Re: [PATCH] staging: exfat: remove staging version of exfat filesystem

In reply to Greg Kroah-Hartman
Quoted 6 lines · On Tuesday 10 March 2020 11:54:21 Greg Kroah-Hartman wrote:

Now that there is a "real" solution for exfat in the vfs tree queued up to be merged in 5.7-rc1 the "old" exfat code in staging can be removed.

Many thanks to Valdis for doing the work to get this into the tree in the first place, it was greatly appreciated.

Quoted 8 lines
Cc Valdis Kletnieks <[email protected]>
Cc Pali Rohár <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Al Viro <[email protected]>
Cc Namjae Jeon <[email protected]>
Cc Sungjong Seo <[email protected]>
Cc Christoph Hellwig <[email protected]>
Quoted 25 lines
---
 MAINTAINERS                          |    6 -
 drivers/staging/Kconfig              |    2 -
 drivers/staging/Makefile             |    1 -
 drivers/staging/exfat/Kconfig        |   41 -
 drivers/staging/exfat/Makefile       |   10 -
 drivers/staging/exfat/TODO           |   69 -
 drivers/staging/exfat/exfat.h        |  760 ------
 drivers/staging/exfat/exfat_blkdev.c |  138 --
 drivers/staging/exfat/exfat_cache.c  |  514 ----
 drivers/staging/exfat/exfat_core.c   | 2529 --------------------
 drivers/staging/exfat/exfat_nls.c    |  212 --
 drivers/staging/exfat/exfat_super.c  | 3296 --------------------------
 drivers/staging/exfat/exfat_upcase.c |  740 ------
 13 files changed, 8318 deletions(-)
 delete mode 100644 drivers/staging/exfat/Kconfig
 delete mode 100644 drivers/staging/exfat/Makefile
 delete mode 100644 drivers/staging/exfat/TODO
 delete mode 100644 drivers/staging/exfat/exfat.h
 delete mode 100644 drivers/staging/exfat/exfat_blkdev.c
 delete mode 100644 drivers/staging/exfat/exfat_cache.c
 delete mode 100644 drivers/staging/exfat/exfat_core.c
 delete mode 100644 drivers/staging/exfat/exfat_nls.c
 delete mode 100644 drivers/staging/exfat/exfat_super.c
 delete mode 100644 drivers/staging/exfat/exfat_upcase.c