The module name conflict is still remaining.

  error: the following would cause module name conflict:
    drivers/char/adi.ko
    drivers/input/joystick/adi.ko

Make it a warning again to build sparc64 allmodconfig successfully.

Fixes: 8451791d1ff0 ("kbuild: make module name conflict fatal error")
Reported-by: Guenter Roeck <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
---

 scripts/modules-check.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/modules-check.sh b/scripts/modules-check.sh
index 43de226071ae..8b1785863c64 100755
--- a/scripts/modules-check.sh
+++ b/scripts/modules-check.sh
@@ -15,9 +15,10 @@ check_same_name_modules()
 {
        for m in $(sed 's:.*/::' $1 | sort | uniq -d)
        do
-               echo "error: the following would cause module name conflict:" 
>&2
+               echo "warning: the following would cause module name conflict:" 
>&2
                sed -n "/\/$m/s:^:  :p" modules.order >&2
-               exit_code=1
+               # TODO: turn this into an error after fixing all warnings
+               #exit_code=1
        done
 }
 
-- 
2.25.1

Reply via email to