# git rev-parse -q --verify 1a0beef98b582b69a2ba44e468f7dfecbcfab48e^{commit} 1a0beef98b582b69a2ba44e468f7dfecbcfab48e already have revision, skipping fetch # git checkout -q -f -B kisskb 1a0beef98b582b69a2ba44e468f7dfecbcfab48e # git clean -qxdf # < git log -1 # commit 1a0beef98b582b69a2ba44e468f7dfecbcfab48e # Merge: dc7e22a368c2 bd8621ca1510 # Author: Linus Torvalds # Date: Mon Apr 24 11:40:26 2023 -0700 # # Merge tag 'tpmdd-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd # # Pull tpm updates from Jarkko Sakkinen: # # - The .machine keyring, used for Machine Owner Keys (MOK), acquired the # ability to store only CA enforced keys, and put rest to the .platform # keyring, thus separating the code signing keys from the keys that are # used to sign certificates. # # This essentially unlocks the use of the .machine keyring as a trust # anchor for IMA. It is an opt-in feature, meaning that the additional # contraints won't brick anyone who does not care about them. # # - Enable interrupt based transactions with discrete TPM chips (tpm_tis). # # There was code for this existing but it never really worked so I # consider this a new feature rather than a bug fix. Before the driver # just fell back to the polling mode. # # Link: https://lore.kernel.org/linux-integrity/a93b6222-edda-d43c-f010-a59701f2aeef@gmx.de/ # Link: https://lore.kernel.org/linux-integrity/20230302164652.83571-1-eric.snowberg@oracle.com/ # # * tag 'tpmdd-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd: (29 commits) # tpm: Add !tpm_amd_is_rng_defective() to the hwrng_unregister() call site # tpm_tis: fix stall after iowrite*()s # tpm/tpm_tis_synquacer: Convert to platform remove callback returning void # tpm/tpm_tis: Convert to platform remove callback returning void # tpm/tpm_ftpm_tee: Convert to platform remove callback returning void # tpm: tpm_tis_spi: Mark ACPI and OF related data as maybe unused # tpm: st33zp24: Mark ACPI and OF related data as maybe unused # tpm, tpm_tis: Enable interrupt test # tpm, tpm_tis: startup chip before testing for interrupts # tpm, tpm_tis: Claim locality when interrupts are reenabled on resume # tpm, tpm_tis: Claim locality in interrupt handler # tpm, tpm_tis: Request threaded interrupt handler # tpm, tpm: Implement usage counter for locality # tpm, tpm_tis: do not check for the active locality in interrupt handler # tpm, tpm_tis: Move interrupt mask checks into own function # tpm, tpm_tis: Only handle supported interrupts # tpm, tpm_tis: Claim locality before writing interrupt registers # tpm, tpm_tis: Do not skip reset of original interrupt vector # tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed # tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register # ... # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 1a0beef98b582b69a2ba44e468f7dfecbcfab48e # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:1118: Error: unknown pseudo-op: `.' sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source if appropriate. See for instructions. make[5]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/net/pcs/pcs-xpcs.o] Error 4 make[4]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/net/pcs] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/net] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: drivers] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:2025: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:07:03.240308