On Thu Apr 27, 2023 at 6:38 PM EEST, Linus Torvalds wrote: > On Thu, Apr 27, 2023 at 4:11 AM Jarkko Sakkinen <jarkko@xxxxxxxxxx> wrote: > > > > This PR fixes a critical bug in my first pull request. > > That doesn't work AT ALL. > > You have this duplicated line > > - TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > + TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > + TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > + TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > > in that patch (presumably due to some edit-time fat-fingering), which > causes lots and lots of > > ./include/linux/tpm.h:285:9: error: redeclaration of enumerator > ‘TPM_CHIP_FLAG_FIRMWARE_UPGRADE’ > 285 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ./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), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ./include/linux/tpm.h:286:9: error: redeclaration of enumerator > ‘TPM_CHIP_FLAG_FIRMWARE_UPGRADE’ > 286 | TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > errors. > > While I could easily just remove the duplicated lines in my merge, > that would make things non-bisectable, so I unpulled this instead. > > Linus My bad, please do not. I'll send a new one, cherry pick gone wrong :-( BR, Jarkko
