# git rev-parse -q --verify ae90f6a6170d7a7a1aa4fddf664fbd093e3023bc^{commit} ae90f6a6170d7a7a1aa4fddf664fbd093e3023bc already have revision, skipping fetch # git checkout -q -f -B kisskb ae90f6a6170d7a7a1aa4fddf664fbd093e3023bc # git clean -qxdf # < git log -1 # commit ae90f6a6170d7a7a1aa4fddf664fbd093e3023bc # Merge: d44cd8226449 d5fb316e2af1 # Author: Linus Torvalds # Date: Thu Oct 24 16:53:20 2024 -0700 # # Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf # # Pull bpf fixes from Daniel Borkmann: # # - Fix an out-of-bounds read in bpf_link_show_fdinfo for BPF sockmap # link file descriptors (Hou Tao) # # - Fix BPF arm64 JIT's address emission with tag-based KASAN enabled # reserving not enough size (Peter Collingbourne) # # - Fix BPF verifier do_misc_fixups patching for inlining of the # bpf_get_branch_snapshot BPF helper (Andrii Nakryiko) # # - Fix a BPF verifier bug and reject BPF program write attempts into # read-only marked BPF maps (Daniel Borkmann) # # - Fix perf_event_detach_bpf_prog error handling by removing an invalid # check which would skip BPF program release (Jiri Olsa) # # - Fix memory leak when parsing mount options for the BPF filesystem # (Hou Tao) # # * tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: # bpf: Check validity of link->type in bpf_link_show_fdinfo() # bpf: Add the missing BPF_LINK_TYPE invocation for sockmap # bpf: fix do_misc_fixups() for bpf_get_branch_snapshot() # bpf,perf: Fix perf_event_detach_bpf_prog error handling # selftests/bpf: Add test for passing in uninit mtu_len # selftests/bpf: Add test for writes to .rodata # bpf: Remove MEM_UNINIT from skb/xdp MTU helpers # bpf: Fix overloading of MEM_UNINIT's meaning # bpf: Add MEM_WRITE attribute # bpf: Preserve param->string when parsing mount options # bpf, arm64: Fix address emission with tag-based KASAN enabled # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 ae90f6a6170d7a7a1aa4fddf664fbd093e3023bc # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.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 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 # Build took: 0:02:07.288467