On Tue Sep 12, 2023 at 1:32 AM EEST, Justin M. Forbes wrote:
> Commit d2e8071bed0be ("tpm: make all 'class' structures const")
> unfortunately had a typo for the name on tpmrm.
>
> Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
> Signed-off-by: Justin M. Forbes <[email protected]>
> ---
> drivers/char/tpm/tpm-chip.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 23f6f2eda84c..42b1062e33cd 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -33,7 +33,7 @@ const struct class tpm_class = {
> .shutdown_pre = tpm_class_shutdown,
> };
> const struct class tpmrm_class = {
> - .name = "tmprm",
> + .name = "tpmrm",
> };
> dev_t tpm_devt;
>
> --
> 2.41.0
Unfortunately your patch does not apply:
$ git-tip
0bb80ecc33a8 (HEAD -> next, tag: v6.6-rc1, upstream/master, origin/next) Linux 6.6-rc1
$ b4 am [email protected]
Analyzing 1 messages in the thread
Checking attestation on all messages, may take a moment...
---
✓ [PATCH] tpm: Fix typo in tpmrm class definition
---
✓ Signed: DKIM/linuxtx.org (From: [email protected])
---
Total patches: 1
---
Link: https://lore.kernel.org/r/[email protected]
Base: applies clean to current tree
git checkout -b 20230911_jforbes_fedoraproject_org HEAD
git am ./20230911_jforbes_tpm_fix_typo_in_tpmrm_class_definition.mbx
$ git am -3 20230911_jforbes_tpm_fix_typo_in_tpmrm_class_definition.mbx
Applying: tpm: Fix typo in tpmrm class definition
error: corrupt patch at line 18
error: could not build fake ancestor
Patch failed at 0001 tpm: Fix typo in tpmrm class definition
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
BR, Jarkko
On Tue, Sep 12, 2023 at 4:41 AM Jarkko Sakkinen <[email protected]> wrote:
>
> On Tue Sep 12, 2023 at 1:32 AM EEST, Justin M. Forbes wrote:
> > Commit d2e8071bed0be ("tpm: make all 'class' structures const")
> > unfortunately had a typo for the name on tpmrm.
> >
> > Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
> > Signed-off-by: Justin M. Forbes <[email protected]>
> > ---
> > drivers/char/tpm/tpm-chip.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index 23f6f2eda84c..42b1062e33cd 100644
> > --- a/drivers/char/tpm/tpm-chip.c
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -33,7 +33,7 @@ const struct class tpm_class = {
> > .shutdown_pre = tpm_class_shutdown,
> > };
> > const struct class tpmrm_class = {
> > - .name = "tmprm",
> > + .name = "tpmrm",
> > };
> > dev_t tpm_devt;
> >
> > --
> > 2.41.0
>
> Unfortunately your patch does not apply:
Fixed with the V2 I just sent out. Seems I had suppress-blank-empty =
true in a config file somewhere. Apologies for wasting your time.
Justin
> $ git-tip
> 0bb80ecc33a8 (HEAD -> next, tag: v6.6-rc1, upstream/master, origin/next) Linux 6.6-rc1
>
> $ b4 am [email protected]
> Analyzing 1 messages in the thread
> Checking attestation on all messages, may take a moment...
> ---
> ✓ [PATCH] tpm: Fix typo in tpmrm class definition
> ---
> ✓ Signed: DKIM/linuxtx.org (From: [email protected])
> ---
> Total patches: 1
> ---
> Link: https://lore.kernel.org/r/[email protected]
> Base: applies clean to current tree
> git checkout -b 20230911_jforbes_fedoraproject_org HEAD
> git am ./20230911_jforbes_tpm_fix_typo_in_tpmrm_class_definition.mbx
>
> $ git am -3 20230911_jforbes_tpm_fix_typo_in_tpmrm_class_definition.mbx
> Applying: tpm: Fix typo in tpmrm class definition
> error: corrupt patch at line 18
> error: could not build fake ancestor
> Patch failed at 0001 tpm: Fix typo in tpmrm class definition
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> BR, Jarkko