lkml.org 
[lkml]   [2023]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] tpmdd: a critical bug fix for v6.4-rc1
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@kernel.org> 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

\
 
 \ /
  Last update: 2023-04-27 18:31    [W:1.562 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site