# git rev-parse -q --verify 0c559323bbaabee7346c12e74b497e283aaafef5^{commit} 0c559323bbaabee7346c12e74b497e283aaafef5 already have revision, skipping fetch # git checkout -q -f -B kisskb 0c559323bbaabee7346c12e74b497e283aaafef5 # git clean -qxdf # < git log -1 # commit 0c559323bbaabee7346c12e74b497e283aaafef5 # Merge: 263a25de5b60 05cef2c4a421 # Author: Linus Torvalds # Date: Thu Oct 3 17:15:09 2024 -0700 # # Merge tag 'rust-fixes-6.12' of https://github.com/Rust-for-Linux/linux # # Pull Rust fixes from Miguel Ojeda: # "Toolchain and infrastructure: # # - Fix/improve a couple 'depends on' on the newly added CFI/KASAN # suppport to avoid build errors/warnings # # - Fix ARCH_SLAB_MINALIGN multiple definition error for RISC-V under # !CONFIG_MMU # # - Clean upcoming (Rust 1.83.0) Clippy warnings # # 'kernel' crate: # # - 'sync' module: fix soundness issue by requiring 'T: Sync' for # 'LockedBy::access'; and fix helpers build error under PREEMPT_RT # # - Fix trivial sorting issue ('rustfmtcheck') on the v6.12 Rust merge" # # * tag 'rust-fixes-6.12' of https://github.com/Rust-for-Linux/linux: # rust: kunit: use C-string literals to clean warning # cfi: encode cfi normalized integers + kasan/gcov bug in Kconfig # rust: KASAN+RETHUNK requires rustc 1.83.0 # rust: cfi: fix `patchable-function-entry` starting version # rust: mutex: fix __mutex_init() usage in case of PREEMPT_RT # rust: fix `ARCH_SLAB_MINALIGN` multiple definition error # rust: sync: require `T: Sync` for `LockedBy::access` # rust: kernel: sort Rust modules # < /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 0c559323bbaabee7346c12e74b497e283aaafef5 # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_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) # # Added to kconfig CONFIG_NUMA=n # < make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_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+NO_NUMA_powerpc-gcc13 # Build took: 0:02:09.160454