# git rev-parse -q --verify c1a515d3c0270628df8ae5f5118ba859b85464a2^{commit} c1a515d3c0270628df8ae5f5118ba859b85464a2 already have revision, skipping fetch # git checkout -q -f -B kisskb c1a515d3c0270628df8ae5f5118ba859b85464a2 # git clean -qxdf # < git log -1 # commit c1a515d3c0270628df8ae5f5118ba859b85464a2 # Merge: 638c1913d2b0 07d2b820fd75 # Author: Linus Torvalds # Date: Thu Aug 3 15:47:39 2023 -0700 # # Merge tag 'perf-tools-fixes-for-v6.5-2-2023-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Fix segfault in the powerpc specific arch_skip_callchain_idx # function. The patch doing the reference count init/exit that went # into 6.5 missed this function. # # - Fix regression reading the arm64 PMU cpu slots in sysfs, a patch # removing some code duplication ended up duplicating the /sysfs prefix # for these files. # # - Fix grouping of events related to topdown, addressing a regression on # the CSV output produced by 'perf stat' noticed on the downstream tool # toplev. # # - Fix the uprobe_from_different_cu 'perf test' entry, it is failing # when gcc isn't available, so we need to check that and skip the test # if it is not installed. # # * tag 'perf-tools-fixes-for-v6.5-2-2023-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: # perf test parse-events: Test complex name has required event format # perf pmus: Create placholder regardless of scanning core_only # perf test uprobe_from_different_cu: Skip if there is no gcc # perf parse-events: Only move force grouped evsels when sorting # perf parse-events: When fixing group leaders always set the leader # perf parse-events: Extra care around force grouped events # perf callchain powerpc: Fix addr location init during arch_skip_callchain_idx function # perf pmu arm64: Fix reading the PMU cpu slots in sysfs # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 c1a515d3c0270628df8ae5f5118ba859b85464a2 # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_le_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 # Build took: 0:03:29.047423