# git rev-parse -q --verify e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc^{commit} e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc already have revision, skipping fetch # git checkout -q -f -B kisskb e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc # git clean -qxdf # < git log -1 # commit e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc # Merge: 8d6bc6a2b1e1 d3e43a8fa43e # Author: Linus Torvalds # Date: Tue May 28 10:40:52 2024 -0700 # # Merge tag 'tpmdd-next-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd # # Pull tpm fixes from Jarkko Sakkinen: # "This fixes two unaddressed review comments for the HMAC encryption # patch set. They are cosmetic but we are better off, if such # unnecessary glitches do not exist in the release. # # The important part is enabling the HMAC encryption by default only on # x86-64 because that is the only sufficiently tested arch. # # Finally, there is a bug fix for SPI transfer buffer allocation, which # did not take into account the SPI header size" # # * tag 'tpmdd-next-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd: # tpm: Enable TCG_TPM2_HMAC by default only for X86_64 # tpm: Rename TPM2_OA_TMPL to TPM2_OA_NULL_KEY and make it local # tpm: Open code tpm_buf_parameters() # tpm_tis_spi: Account for SPI header when allocating TPM SPI xfer buffer # < /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 e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc # make -s -j 160 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 160 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 160 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 160 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:03:52.178957