# git rev-parse -q --verify b229b6ca5abbd63ff40c1396095b1b36b18139c3^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify b229b6ca5abbd63ff40c1396095b1b36b18139c3^{commit} b229b6ca5abbd63ff40c1396095b1b36b18139c3 # git checkout -q -f -B kisskb b229b6ca5abbd63ff40c1396095b1b36b18139c3 # git clean -qxdf # < git log -1 # commit b229b6ca5abbd63ff40c1396095b1b36b18139c3 # Merge: a2718383ef9d e9229d5b6254 # Author: Linus Torvalds # Date: Wed Oct 26 17:44:10 2022 -0700 # # Merge tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tool fixes from Arnaldo Carvalho de Melo: # # - Fix some aspects of building with an older (than the one in the # kernel sources) libbpf present in a distro, when building with # LIBBPF_DYNAMIC=1. # # - Fix errno setting races with event_fd and the signal handler in 'perf # record'. # # - Fix Power10 hv-24x7 metric events when some events may have a zero # count based on system configuration. # # - Do not fail Intel-PT misc test w/o libpython, just skip it. # # - Fix incorrect arm64 Hisi hip08 L3 metrics (IF_BP_MISP_BR_RET, # IF_BP_MISP_BR_RET, IF_BP_MISP_BR_BL) due to mistakes in the # documentation used to generate the JSON files for these metrics. # # - Fix auxtrace (Intel PT, ARM Coresight) address filter symbol name # match for modules, we need to skip the module name. # # - Sync copies of files with the kernel sources, including ppc syscall # tables and assorted headers, some resulting in tools being able to # decode new network protocols (IPPROTO_L2TP) and statx masks # (STATX_DIOALIGN). # # - Fix PMU name pai_crypto in the vendor events file (JSON) for s390. # # - Fix man page build wrt perf-arm-coresight.txt as the build process # assumes files starting with 'perf-' are man pages, and this file # isn't one. # # * tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf vendor events arm64: Fix incorrect Hisi hip08 L3 metrics # perf auxtrace: Fix address filter symbol name match for modules # tools headers UAPI: Sync linux/perf_event.h with the kernel sources # tools headers cpufeatures: Sync with the kernel sources # tools headers uapi: Sync linux/stat.h with the kernel sources # tools include UAPI: Sync sound/asound.h copy with the kernel sources # tools headers uapi: Update linux/in.h copy # tools headers: Update the copy of x86's memcpy_64.S used in 'perf bench' # tools headers arm64: Sync arm64's cputype.h with the kernel sources # perf test: Do not fail Intel-PT misc test w/o libpython # perf list: Fix PMU name pai_crypto in perf list on s390 # perf record: Fix event fd races # perf bpf: Fix build with libbpf 0.7.0 by checking if bpf_program__set_insns() is available # perf bpf: Fix build with libbpf 0.7.0 by adding prototype for bpf_load_program() # perf vendor events power10: Fix hv-24x7 metric events # perf docs: Fix man page build wrt perf-arm-coresight.txt # tools headers UAPI: Sync powerpc syscall tables with the kernel sources # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 b229b6ca5abbd63ff40c1396095b1b36b18139c3 # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:545, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:457:26: note: in expansion of macro 'printk_index_wrap' 457 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:01:40.587726