# git rev-parse -q --verify 4d66020dcef83314092f2c8c89152a8d122627e2^{commit} 4d66020dcef83314092f2c8c89152a8d122627e2 already have revision, skipping fetch # git checkout -q -f -B kisskb 4d66020dcef83314092f2c8c89152a8d122627e2 # git clean -qxdf # < git log -1 # commit 4d66020dcef83314092f2c8c89152a8d122627e2 # Merge: 77dbd72b982c f37c3bbc6359 # Author: Linus Torvalds # Date: Sun Jan 16 10:15:32 2022 +0200 # # Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing updates from Steven Rostedt: # "New: # # - The Real Time Linux Analysis (RTLA) tool is added to the tools # directory. # # - Can safely filter on user space pointers with: field.ustring ~ # "match-string" # # - eprobes can now be filtered like any other event. # # - trace_marker(_raw) now uses stream_open() to allow multiple threads # to safely write to it. Note, this could possibly break existing # user space, but we will not know until we hear about it, and then # can revert the change if need be. # # - New field in events to display when bottom halfs are disabled. # # - Sorting of the ftrace functions are now done at compile time # instead of at bootup. # # Infrastructure changes to support future efforts: # # - Added __rel_loc type for trace events. Similar to __data_loc but # the offset to the dynamic data is based off of the location of the # descriptor and not the beginning of the event. Needed for user # defined events. # # - Some simplification of event trigger code. # # - Make synthetic events process its callback better to not hinder # other event callbacks that are registered. Needed for user defined # events. # # And other small fixes and cleanups" # # * tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (50 commits) # tracing: Add ustring operation to filtering string pointers # rtla: Add rtla timerlat hist documentation # rtla: Add rtla timerlat top documentation # rtla: Add rtla timerlat documentation # rtla: Add rtla osnoise hist documentation # rtla: Add rtla osnoise top documentation # rtla: Add rtla osnoise man page # rtla: Add Documentation # rtla/timerlat: Add timerlat hist mode # rtla: Add timerlat tool and timelart top mode # rtla/osnoise: Add the hist mode # rtla/osnoise: Add osnoise top mode # rtla: Add osnoise tool # rtla: Helper functions for rtla # rtla: Real-Time Linux Analysis tool # tracing/osnoise: Properly unhook events if start_per_cpu_kthreads() fails # tracing: Remove duplicate warnings when calling trace_create_file() # tracing/kprobes: 'nmissed' not showed correctly for kretprobe # tracing: Add test for user space strings when filtering on string pointers # tracing: Have syscall trace events use trace_event_buffer_lock_reserve() # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 4d66020dcef83314092f2c8c89152a8d122627e2 # < make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12205:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12208:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12210:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12212:warning: override: reassigning to symbol UML_NET_SLIP .config:12215:warning: override: reassigning to symbol UML_NET_MCAST .config:12217:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/kernel/sysctl.c:125:12: error: 'one_thousand' defined but not used [-Werror=unused-variable] static int one_thousand = 1000; ^ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: kernel/sysctl.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1840: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: In function 'vfio_pci_vga_rw': /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:11: error: implicit declaration of function 'ioport_map' [-Werror=implicit-function-declaration] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:324:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3c0, 0x3df - 0x3c0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:338:15: error: implicit declaration of function 'ioport_unmap' [-Werror=implicit-function-declaration] is_ioport ? ioport_unmap(iomem) : iounmap(iomem); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/vfio/pci/vfio_pci_rdwr.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio/pci] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:25: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1556:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1560:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1840: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:10:56.620050