On Thu Apr 27, 2023 at 3:55 PM EEST, wrote: > Hi all, > > After merging the tpmdd tree, today's linux-next build (arm64 defconfig > and others) failed like this: > > In file included from /tmp/next/build/include/linux/tpm_eventlog.h:6, > from /tmp/next/build/drivers/char/tpm/tpm-chip.c:24: > /tmp/next/build/include/linux/tpm.h:285:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' > 285 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /tmp/next/build/include/linux/tpm.h:284:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int' > 284 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /tmp/next/build/include/linux/tpm.h:286:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' > 286 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /tmp/next/build/include/linux/tpm.h:285:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int' > 285 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > make[5]: *** [/tmp/next/build/scripts/Makefile.build:252: drivers/char/tpm/tpm-chip.o] Error 1 > make[4]: *** [/tmp/next/build/scripts/Makefile.build:494: drivers/char/tpm] Error 2 > make[3]: *** [/tmp/next/build/scripts/Makefile.build:494: drivers/char] Error 2 > make[3]: *** Waiting for unfinished jobs.... > In file included from /tmp/next/build/include/keys/trusted-type.h:12, > from /tmp/next/build/crypto/af_alg.c:26: > /tmp/next/build/include/linux/tpm.h:285:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' > 285 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /tmp/next/build/include/linux/tpm.h:284:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int' > 284 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /tmp/next/build/include/linux/tpm.h:286:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' > 286 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /tmp/next/build/include/linux/tpm.h:285:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int' > 285 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > make[3]: *** [/tmp/next/build/scripts/Makefile.build:252: crypto/af_alg.o] Error 1 > > Caused by commit > > e2f14081c6839 ("tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM drivers") > > I will use the tree from yesterday instead. Hi sorry about this, I've dropped the commit. BR, Jarkko