# git rev-parse -q --verify b047602d579b4fb028128a525f056bbdc890e7f0^{commit} b047602d579b4fb028128a525f056bbdc890e7f0 already have revision, skipping fetch # git checkout -q -f -B kisskb b047602d579b4fb028128a525f056bbdc890e7f0 # git clean -qxdf # < git log -1 # commit b047602d579b4fb028128a525f056bbdc890e7f0 # Merge: 72a8e05d4f66 1e1fb420fe68 # Author: Linus Torvalds # Date: Tue Jul 12 16:17:40 2022 -0700 # # Merge tag 'trace-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing fixes from Steven Rostedt: # "Fixes and minor clean ups for tracing: # # - Fix memory leak by reverting what was thought to be a double free. # # A static tool had gave a false positive that a double free was # possible in the error path, but it was actually a different # location that confused the static analyzer (and those of us that # reviewed it). # # - Move use of static buffers by ftrace_dump() to a location that can # be used by kgdb's ftdump(), as it needs it for the same reasons. # # - Clarify in the Kconfig description that function tracing has # negligible impact on x86, but may have a bit bigger impact on other # architectures. # # - Remove unnecessary extra semicolon in trace event. # # - Make a local variable static that is used in the fprobes sample # # - Use KSYM_NAME_LEN for length of function in kprobe sample and get # rid of unneeded macro for the same purpose" # # * tag 'trace-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: # samples: Use KSYM_NAME_LEN for kprobes # fprobe/samples: Make sample_probe static # blk-iocost: tracing: atomic64_read(&ioc->vtime_rate) is assigned an extra semicolon # ftrace: Be more specific about arch impact when function tracer is enabled # tracing: Fix sleeping while atomic in kdb ftdump # tracing/histograms: Fix memory leak problem # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 b047602d579b4fb028128a525f056bbdc890e7f0 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:6471:warning: override: reassigning to symbol STANDALONE .config:6475:warning: override: reassigning to symbol PPC64 .config:6476:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:6477:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:6478:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.o uses soft float /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.o /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.o uses soft float /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.o /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.o uses soft float /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.o make[2]: *** [/kisskb/src/scripts/Makefile.vmlinux_o:68: vmlinux.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1164: vmlinux] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 # Build took: 0:04:50.501117