# git rev-parse -q --verify e0b668b070348c36e0ab83af12987b6390f9ec26^{commit} e0b668b070348c36e0ab83af12987b6390f9ec26 already have revision, skipping fetch # git checkout -q -f -B kisskb e0b668b070348c36e0ab83af12987b6390f9ec26 # git clean -qxdf # < git log -1 # commit e0b668b070348c36e0ab83af12987b6390f9ec26 # Merge: 769327258a14 a11aaf6d0bb4 # Author: Linus Torvalds # Date: Sun Jun 30 10:00:01 2024 -0700 # # Merge tag 'kbuild-fixes-v6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild # # Pull Kbuild fixes from Masahiro Yamada: # # - Remove the executable bit from installed DTB files # # - Escape $ in subshell execution in the debian-orig target # # - Fix RPM builds with CONFIG_MODULES=n # # - Fix xconfig with the O= option # # - Fix scripts_gdb with the O= option # # * tag 'kbuild-fixes-v6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: # kbuild: scripts/gdb: bring the "abspath" back # kbuild: Use $(obj)/%.cc to fix host C++ module builds # kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n # kbuild: Fix build target deb-pkg: ln: failed to create hard link # kbuild: doc: Update default INSTALL_MOD_DIR from extra to updates # kbuild: Install dtb files as 0644 in Makefile.dtbinst # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux-ld --version # < git log --format=%s --max-count=1 e0b668b070348c36e0ab83af12987b6390f9ec26 # make -s -j 160 ARCH=parisc O=/kisskb/build/linus_allmodconfig_parisc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=parisc O=/kisskb/build/linus_allmodconfig_parisc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux- help # make -s -j 160 ARCH=parisc O=/kisskb/build/linus_allmodconfig_parisc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux- olddefconfig # make -s -j 160 ARCH=parisc O=/kisskb/build/linus_allmodconfig_parisc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux- In file included from /kisskb/src/fs/notify/fanotify/fanotify_user.c:14: /kisskb/src/include/linux/syscalls.h:248:25: error: conflicting types for 'sys_fanotify_mark'; have 'long int(int, unsigned int, u32, u32, int, const char *)' {aka 'long int(int, unsigned int, unsigned int, unsigned int, int, const char *)'} 248 | asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \ | ^~~ /kisskb/src/include/linux/syscalls.h:234:9: note: in expansion of macro '__SYSCALL_DEFINEx' 234 | __SYSCALL_DEFINEx(x, sname, __VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/syscalls.h:228:36: note: in expansion of macro 'SYSCALL_DEFINEx' 228 | #define SYSCALL_DEFINE6(name, ...) SYSCALL_DEFINEx(6, _##name, __VA_ARGS__) | ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/syscalls.h:287:27: note: in expansion of macro 'SYSCALL_DEFINE6' 287 | #define SYSCALL32_DEFINE6 SYSCALL_DEFINE6 | ^~~~~~~~~~~~~~~ /kisskb/src/fs/notify/fanotify/fanotify_user.c:1924:1: note: in expansion of macro 'SYSCALL32_DEFINE6' 1924 | SYSCALL32_DEFINE6(fanotify_mark, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/syscalls.h:862:17: note: previous declaration of 'sys_fanotify_mark' with type 'long int(int, unsigned int, u64, int, const char *)' {aka 'long int(int, unsigned int, long long unsigned int, int, const char *)'} 862 | asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags, | ^~~~~~~~~~~~~~~~~ make[6]: *** [/kisskb/src/scripts/Makefile.build:244: fs/notify/fanotify/fanotify_user.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: fs/notify/fanotify] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: fs/notify] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: fs] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1934: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=parisc O=/kisskb/build/linus_allmodconfig_parisc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/hppa-linux/bin/hppa-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_parisc-gcc13 # Build took: 0:08:57.743655