Re: [PATCH 0/2] virt: Set tpm-tis-device ppi property to off by default

[Stefan Berger]

On 4/29/20 2:11 AM, Cornelia Huck wrote:
> On Tue, 28 Apr 2020 16:13:05 -0400
> Stefan Berger <address@hidden> wrote:
>
> > On 4/28/20 6:38 AM, Cornelia Huck wrote:
> > > On Mon, 27 Apr 2020 16:31:43 +0200
> > > Eric Auger <address@hidden> wrote:
> > >   
> > > > Instead of using a compat in the mach-virt machine to force
> > > > PPI off for all virt machines (PPI not supported by the
> > > > tpm-tis-device device), let's simply change the default value
> > > > in the sysbus device.
> > > >
> > > > Best Regards
> > > >
> > > > Eric
> > > >
> > > > Eric Auger (2):
> > > >     tpm: tpm-tis-device: set PPI to false by default
> > > >     hw/arm/virt: Remove the compat forcing tpm-tis-device PPI to off
> > > >
> > > >    hw/arm/virt.c           | 5 -----
> > > >    hw/tpm/tpm_tis_sysbus.c | 2 +-
> > > >    2 files changed, 1 insertion(+), 6 deletions(-)
> > > >   
> > > I think we can apply the compat machines patch on top of these two
> > > patches.
> > >
> > > Q: Who will queue this and the machine types patch? It feels a bit
> > > weird taking arm patches through the s390 tree :)
> > >   
> > I can queue them and would send the PR soon. I am also fine with someone
> > else doing it.
> Would be great if you could queue these together with
> https://patchew.org/QEMU/address@hidden/
> (hopefully should still apply cleanly, let me know if a respin is
> needed).
It's probably better to respin:

> patches apply id:address@hidden
Applying: hw: add compat machines for 5.1
Using index info to reconstruct a base tree...
M    hw/arm/virt.c
Falling back to patching base and 3-way merge...
Auto-merging hw/arm/virt.c
CONFLICT (content): Merge conflict in hw/arm/virt.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 hw: add compat machines for 5.1
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".