# git rev-parse -q --verify 2c8159388952f530bd260e097293ccc0209240be^{commit} 2c8159388952f530bd260e097293ccc0209240be already have revision, skipping fetch # git checkout -q -f -B kisskb 2c8159388952f530bd260e097293ccc0209240be # git clean -qxdf # < git log -1 # commit 2c8159388952f530bd260e097293ccc0209240be # Merge: 57865f397001 19843452dca4 # Author: Linus Torvalds # Date: Sat Apr 27 12:11:55 2024 -0700 # # Merge tag 'rust-fixes-6.9' of https://github.com/Rust-for-Linux/linux # # Pull Rust fixes from Miguel Ojeda: # # - Soundness: make internal functions generated by the 'module!' macro # inaccessible, do not implement 'Zeroable' for 'Infallible' and # require 'Send' for the 'Module' trait. # # - Build: avoid errors with "empty" files and workaround 'rustdoc' ICE. # # - Kconfig: depend on '!CFI_CLANG' and avoid selecting 'CONSTRUCTORS'. # # - Code docs: remove non-existing key from 'module!' macro example. # # - Docs: trivial rendering fix in arch table. # # * tag 'rust-fixes-6.9' of https://github.com/Rust-for-Linux/linux: # rust: remove `params` from `module` macro example # kbuild: rust: force `alloc` extern to allow "empty" Rust files # kbuild: rust: remove unneeded `@rustc_cfg` to avoid ICE # rust: kernel: require `Send` for `Module` implementations # rust: phy: implement `Send` for `Registration` # rust: make mutually exclusive with CFI_CLANG # rust: macros: fix soundness issue in `module!` macro # rust: init: remove impl Zeroable for Infallible # docs: rust: fix improper rendering in Arch Support page # rust: don't select CONSTRUCTORS # < /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 2c8159388952f530bd260e097293ccc0209240be # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_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_PPC_SPLPAR=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_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_SPLPAR_powerpc-gcc13 # Build took: 0:08:06.079086