mbox

[tpmdd-devel,PULL,REQUEST] Pull TPM Fixes/Changes / TPM2.0 Support for 3.20 (for-linus)

Message ID 201501192052.41273.PeterHuewe@gmx.de
State Superseded, archived
Headers show

Pull-request

https://github.com/PeterHuewe/linux-tpmdd for-james

Message

Peter Hüwe Jan. 19, 2015, 7:52 p.m. UTC
Hi James,

sorry for the breakage. :( embarrassing, yes.
> 
> I'm seeing this build error:
> 
>   LD      drivers/char/tpm/built-in.o
> drivers/char/tpm/tpm_crb.c:346: error: crb_pm undeclared here (not in a
> function)
> make[2]: *** [drivers/char/tpm/tpm_crb.o] Error 1
> make[1]: *** [drivers/char/tpm] Error 2
> make: *** [_module_drivers/char] Error 2

Jarkko cleaned up this error and provided a patch.

-> Can you please pull this one?
New compared to previous pull request is Jarkkos fix and a minor checkpatch 
cleanup by Bruno.


The following changes since commit bb31f607a0900552926ebf9ef3d002d96a43f7cc:

  Merge tag 'keys-next-fixes-20150114' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next 
(2015-01-15 11:30:54 +1100)

are available in the git repository at:

  https://github.com/PeterHuewe/linux-tpmdd for-james

for you to fetch changes up to 914309995ed5c6c737df4135ac5ba2b67cff194d:

  char/tpm/tpm_crb: fix build error (2015-01-19 20:46:50 +0100)

----------------------------------------------------------------
Ashley Lai (1):
      tpm_ibmvtpm: Update email address in maintainers list and ibmvtpm driver

Bruno E O Meneguele (1):
      char/tpm: fixed white spaces coding style issues

Christophe Ricard (22):
      tpm/tpm_i2c_stm_st33: Fix potential bug in tpm_stm_i2c_send
      tpm/tpm_i2c_stm_st33: Update Kconfig in order to be inline to other 
similar product
      tpm/tpm_i2c_stm_st33: Change License header to have up to date address 
information
      tpm/tpm_i2c_stm_st33: Fix few coding style error reported by 
scripts/checkpatch.pl
      tpm/tpm_i2c_stm_st33: Move tpm registers to tpm_i2c_stm_st33.c
      tpm/tpm_i2c_stm_st33: Add new tpm_stm_dev structure and remove 
tpm_i2c_buffer[0], [1] buffer.
      tpm/tpm_i2c_stm_st33: Remove reference to io_serirq
      tpm/tpm_i2c_stm_st33: Replace err/rc/ret by ret for a function return 
code
      tpm/tpm_i2c_stm_st33: Replace tpm_st33_* function with tpm_stm_*
      tpm/tpm_i2c_stm_st33: Add devicetree structure
      tpm/tpm_i2c_stm_st33/dts/st33zp24_i2c: Add DTS Documentation
      tpm/tpm_i2c_stm_st33: Few code cleanup
      tpm/tpm_i2c_stm_st33: Interrupt management improvement
      tpm/tpm_i2c_stm_st33: Remove useless i2c read on interrupt registers
      tpm/tpm_i2c_stm_st33: Increment driver version to 1.2.1.
      tpm/tpm_i2c_stm_st33: Fix coccinelle warnings. Possible NULL pointer 
dereference
      tpm/tpm_i2c_stm_st33: Add status check when reading data on the FIFO
      tpm/tpm_i2c_stm_st33: Remove sparse spaces
      tpm/tpm_i2c_stm_st33: Sanity cleanup
      tpm/tpm_i2c_stm_st33: Replace remaining r by ret
      tpm/tpm_i2c_stm_st33: Change tpm_i2c_stm_st33.h to tpm_stm_st33.h
      tpm/tpm_i2c_stm_st33/dts/st33zp24-i2c: Rename st33zp24 dts documentation

David Howells (1):
      TPM: Add new TPMs to the tail of the list to prevent inadvertent change 
of dev

Fabian Frederick (1):
      tpm: remove unnecessary sizeof(u8)

Hon Ching (Vicky) Lo (1):
      tpm: Fix NULL return in tpm_ibmvtpm_get_desired_dma

Jarkko Sakkinen (9):
      tpm: merge duplicate transmit_cmd() functions
      tpm: two-phase chip management functions
      tpm: fix raciness of PPI interface lookup
      tpm: rename chip->dev to chip->pdev
      tpm: device class for tpm
      tpm: TPM 2.0 baseline support
      tpm: TPM 2.0 CRB Interface
      tpm: TPM 2.0 FIFO Interface
      char/tpm/tpm_crb: fix build error

Kiran Padwal (1):
      char: tpm: Add missing error check for devm_kzalloc

Markus Elfring (1):
      char: tpm: Deletion of unnecessary checks before the function call 
"tpm_dev_vendor_release"

Peter Huewe (1):
      MAINTAINERS: Add Patchwork and Git URL for TPMDD

Scot Doyle (1):
      tpm_tis: verify interrupt during init

 Documentation/ABI/stable/sysfs-class-tpm           |  22 +-
 .../bindings/security/tpm/st33zp24-i2c.txt         |  36 ++
 MAINTAINERS                                        |  10 +-
 drivers/char/tpm/Kconfig                           |  15 +-
 drivers/char/tpm/Makefile                          |   5 +-
 drivers/char/tpm/tpm-chip.c                        | 256 ++++++++
 drivers/char/tpm/tpm-dev.c                         |  42 +-
 drivers/char/tpm/tpm-interface.c                   | 263 +++-----
 drivers/char/tpm/tpm-sysfs.c                       |  29 +-
 drivers/char/tpm/tpm.h                             | 124 +++-
 drivers/char/tpm/tpm2-cmd.c                        | 617 +++++++++++++++++++
 drivers/char/tpm/tpm_atmel.c                       |  25 +-
 drivers/char/tpm/tpm_crb.c                         | 354 +++++++++++
 drivers/char/tpm/tpm_i2c_atmel.c                   |  52 +-
 drivers/char/tpm/tpm_i2c_infineon.c                |  43 +-
 drivers/char/tpm/tpm_i2c_nuvoton.c                 |  69 +--
 drivers/char/tpm/tpm_i2c_stm_st33.c                | 666 
+++++++++++----------
 drivers/char/tpm/tpm_ibmvtpm.c                     |  27 +-
 drivers/char/tpm/tpm_ibmvtpm.h                     |   2 +-
 drivers/char/tpm/tpm_infineon.c                    |  51 +-
 drivers/char/tpm/tpm_nsc.c                         |  34 +-
 drivers/char/tpm/tpm_of.c                          |   2 +-
 drivers/char/tpm/tpm_ppi.c                         | 141 +++--
 drivers/char/tpm/tpm_tis.c                         | 274 ++++++---
 drivers/char/tpm/xen-tpmfront.c                    |  14 +-
 .../linux/platform_data/tpm_stm_st33.h             |  38 +-
 26 files changed, 2293 insertions(+), 918 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/security/tpm/st33zp24-
i2c.txt
 create mode 100644 drivers/char/tpm/tpm-chip.c
 create mode 100644 drivers/char/tpm/tpm2-cmd.c
 create mode 100644 drivers/char/tpm/tpm_crb.c
 rename drivers/char/tpm/tpm_i2c_stm_st33.h => 
include/linux/platform_data/tpm_stm_st33.h (53%)

------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet