# git rev-parse -q --verify a050a6d2b7e80ca52b2f4141eaf3420d201b72b3^{commit} a050a6d2b7e80ca52b2f4141eaf3420d201b72b3 already have revision, skipping fetch # git checkout -q -f -B kisskb a050a6d2b7e80ca52b2f4141eaf3420d201b72b3 # git clean -qxdf # < git log -1 # commit a050a6d2b7e80ca52b2f4141eaf3420d201b72b3 # Merge: 1434a3127887 f8b61bd20479 # Author: Linus Torvalds # Date: Mon May 24 16:03:24 2021 -1000 # # Merge tag 'perf-tools-fixes-for-v5.13-2021-05-24' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tool fixes from Arnaldo Carvalho de Melo: # # - Fix 'perf script' decoding of Intel PT traces for abort handling and # sample instruction bytes. # # - Add missing PERF_IP_FLAG_CHARS for VM-Entry and VM-Exit to Intel PT # 'perf script' decoder. # # - Fixes for the python based Intel PT trace viewer GUI. # # - Sync UAPI copies (unwire quotactl_path, some comment fixes). # # - Fix handling of missing kernel software events, such as the recently # added 'cgroup-switches', and add the trivial glue for it in the # tooling side, since it was added in this merge window. # # - Add missing initialization of zstd_data in 'perf buildid-list', # detected with valgrind's memcheck. # # - Remove needless event enable/disable when all events uses BPF. # # - Fix libpfm4 support (63) test error for nested event groups. # # * tag 'perf-tools-fixes-for-v5.13-2021-05-24' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf stat: Skip evlist__[enable|disable] when all events uses BPF # perf script: Add missing PERF_IP_FLAG_CHARS for VM-Entry and VM-Exit # perf scripts python: exported-sql-viewer.py: Fix warning display # perf scripts python: exported-sql-viewer.py: Fix Array TypeError # perf scripts python: exported-sql-viewer.py: Fix copy to clipboard from Top Calls by elapsed Time report # tools headers UAPI: Sync files changed by the quotactl_path unwiring # tools headers UAPI: Sync linux/perf_event.h with the kernel sources # tools headers UAPI: Sync linux/fs.h with the kernel sources # perf parse-events: Check if the software events array slots are populated # perf tools: Add 'cgroup-switches' software event # perf intel-pt: Remove redundant setting of ptq->insn_len # perf intel-pt: Fix sample instruction bytes # perf intel-pt: Fix transaction abort handling # perf test: Fix libpfm4 support (63) test error for nested event groups # tools arch kvm: Sync kvm headers with the kernel sources # perf buildid-list: Initialize zstd_data # < /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 a050a6d2b7e80ca52b2f4141eaf3420d201b72b3 # < make -s -j 10 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 10 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 10 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:4574:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4576:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4580:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4582:warning: override: reassigning to symbol UML_NET_SLIP .config:4585:warning: override: reassigning to symbol UML_NET_MCAST .config:4587:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 10 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 LINK linux Completed OK # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:07:33.024064