# git rev-parse -q --verify 5fe326b4467689ef3690491ee2ad25ff4d81fe59^{commit} 5fe326b4467689ef3690491ee2ad25ff4d81fe59 already have revision, skipping fetch # git checkout -q -f -B kisskb 5fe326b4467689ef3690491ee2ad25ff4d81fe59 # git clean -qxdf # < git log -1 # commit 5fe326b4467689ef3690491ee2ad25ff4d81fe59 # Merge: ae8373a5add4 cf7f2732b4b8 # Author: Linus Torvalds # Date: Tue May 23 10:47:32 2023 -0700 # # Merge tag 'erofs-for-6.4-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs # # Pull erofs fixes from Gao Xiang: # "One patch addresses a null-ptr-deref issue reported by syzbot weeks # ago, which is caused by the new long xattr name prefix feature and # needs to be fixed. # # The remaining two patches are minor cleanups to avoid unnecessary # compilation and adjust per-cpu kworker configuration. # # Summary: # # - Fix null-ptr-deref related to long xattr name prefixes # # - Avoid pcpubuf compilation if CONFIG_EROFS_FS_ZIP is off # # - Use high priority kthreads by default if per-cpu kthread workers # are enabled" # # * tag 'erofs-for-6.4-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs: # erofs: use HIPRI by default if per-cpu kthreads are enabled # erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off # erofs: fix null-ptr-deref caused by erofs_xattr_prefixes_init # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 5fe326b4467689ef3690491ee2ad25ff4d81fe59 # < make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- allmodconfig # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c: In function 'mtk_hdmi_pll_prepare': /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:357:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code static int mtk_hdmi_pll_prepare(struct clk_hw *hw) ^ /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:357:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c: In function 'mtk_hdmi_pll_set_rate': /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, ^ /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code /kisskb/src/drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c:408:12: sorry, unimplemented: '-mgeneral-regs-only' and floating point code make[5]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/phy/mediatek/phy-mtk-hdmi-mt8195.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/phy/mediatek] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/phy] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: drivers] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/trace/define_trace.h:102:0, from /kisskb/src/fs/xfs/scrub/trace.h:988, from /kisskb/src/fs/xfs/scrub/trace.c:40: /kisskb/src/fs/xfs/./scrub/trace.h: In function 'trace_raw_output_xchk_fsgate_class': /kisskb/src/fs/xfs/scrub/scrub.h:111:28: error: initializer element is not constant #define XREP_ALREADY_FIXED (1 << 31) /* checking our repair work */ ^ /kisskb/src/include/trace/trace_events.h:203:27: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_event_printf(iter, print); \ ^ /kisskb/src/fs/xfs/./scrub/trace.h:164:2: note: in expansion of macro 'TP_printk' TP_printk("dev %d:%d type %s fsgates '%s'", ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:5: note: in expansion of macro '__print_flags' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ /kisskb/src/fs/xfs/./scrub/trace.h:103:4: note: in expansion of macro 'XREP_ALREADY_FIXED' { XREP_ALREADY_FIXED, "already_fixed" } ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:47: note: in expansion of macro 'XFS_SCRUB_STATE_STRINGS' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ /kisskb/src/fs/xfs/scrub/scrub.h:111:28: note: (near initialization for '__flags[3].mask') #define XREP_ALREADY_FIXED (1 << 31) /* checking our repair work */ ^ /kisskb/src/include/trace/trace_events.h:203:27: note: in definition of macro 'DECLARE_EVENT_CLASS' trace_event_printf(iter, print); \ ^ /kisskb/src/fs/xfs/./scrub/trace.h:164:2: note: in expansion of macro 'TP_printk' TP_printk("dev %d:%d type %s fsgates '%s'", ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:5: note: in expansion of macro '__print_flags' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ /kisskb/src/fs/xfs/./scrub/trace.h:103:4: note: in expansion of macro 'XREP_ALREADY_FIXED' { XREP_ALREADY_FIXED, "already_fixed" } ^ /kisskb/src/fs/xfs/./scrub/trace.h:167:47: note: in expansion of macro 'XFS_SCRUB_STATE_STRINGS' __print_flags(__entry->fsgate_flags, "|", XFS_SCRUB_STATE_STRINGS)) ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:252: fs/xfs/scrub/trace.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:494: fs/xfs] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:494: fs] Error 2 make[1]: *** [/kisskb/src/Makefile:2026: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 40 ARCH=arm64 O=/kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_arm64-allmodconfig_arm64-gcc5 # Build took: 0:04:20.235096