[v1] Merge tpm 2017/10/24

[Qemu-devel] [PULL v1 0/5] Merge tpm 2017/10/24

Stefan Berger posted 5 patches 6 years, 5 months ago

Diff against v1
Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1508942875-21557-1-git-send-email-stefanb@linux.vnet.ibm.com

Test checkpatch passed

Test docker passed

Test s390x passed

MAINTAINERS          |  1 +
Makefile.objs        |  2 +-
hw/tpm/tpm_tis.c     |  2 ++
include/sysemu/tpm.h |  1 +
stubs/Makefile.objs  |  1 +
stubs/tpm.c          | 33 +++++++++++++++++++++++++++++++++
tpm.c                |  4 ----
vl.c                 |  2 --
8 files changed, 39 insertions(+), 7 deletions(-)
create mode 100644 stubs/tpm.c

Expand all Fold all

[Qemu-devel] [PULL v1 0/5] Merge tpm 2017/10/24

Posted by Stefan Berger 6 years, 5 months ago

The following series of patches primarily fixes a recent build problem
with --disable-tpm.

     Stefan


The following changes since commit 3d7196d43bfe12efe98568cb60057e273652b99b:

  Merge remote-tracking branch 'remotes/kraxel/tags/usb-20171023-pull-request' into staging (2017-10-24 16:05:57 +0100)

are available in the git repository at:

  git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2017-10-24-1

for you to fetch changes up to 298d8b81d45d2297f88d93604bd5eebfd653d6cf:

  tpm: print buffers received from TPM when debugging (2017-10-25 01:05:53 -0400)

----------------------------------------------------------------
Merge tpm 2017/10/24 v1

----------------------------------------------------------------
Philippe Mathieu-Daudé (4):
      tpm: add missing include
      tpm: add stubs
      tpm: remove unnecessary #ifdef CONFIG_TPM
      vl: remove unnecessary #ifdef CONFIG_TPM

Stefan Berger (1):
      tpm: print buffers received from TPM when debugging

 MAINTAINERS          |  1 +
 Makefile.objs        |  2 +-
 hw/tpm/tpm_tis.c     |  2 ++
 include/sysemu/tpm.h |  1 +
 stubs/Makefile.objs  |  1 +
 stubs/tpm.c          | 33 +++++++++++++++++++++++++++++++++
 tpm.c                |  4 ----
 vl.c                 |  2 --
 8 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 stubs/tpm.c

-- 
2.5.5

Re: [Qemu-devel] [PULL v1 0/5] Merge tpm 2017/10/24

Posted by Peter Maydell 6 years, 5 months ago

On 25 October 2017 at 15:47, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
> The following series of patches primarily fixes a recent build problem
> with --disable-tpm.
>
>      Stefan
>
>
> The following changes since commit 3d7196d43bfe12efe98568cb60057e273652b99b:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/usb-20171023-pull-request' into staging (2017-10-24 16:05:57 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2017-10-24-1
>
> for you to fetch changes up to 298d8b81d45d2297f88d93604bd5eebfd653d6cf:
>
>   tpm: print buffers received from TPM when debugging (2017-10-25 01:05:53 -0400)
>
> ----------------------------------------------------------------
> Merge tpm 2017/10/24 v1

Applied, thanks.

-- PMM