From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 7 Mar 2018 15:50:46 +0000 (+0100)
Subject: Merge tag 'tee-drv-misc-for-v4.17' of https://git.linaro.org:/people/jens.wiklander... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7e66ff96beb616067b3b2b9934f5974b2dd2758;p=linux.git

Merge tag 'tee-drv-misc-for-v4.17' of https://git.linaro.org:/people/jens.wiklander/linux-tee into next/drivers

Pull "Small fix and report OP-TEE revision information" from Jens Wiklander:

* Adds one small fix correct max value of privileged device id allocation,
  this is only needed if there's more than TEE_NUM_DEVICES / 2 (16) tee
  drivers registered. One or two is a normal value.
* Reports OP-TEE revision information (major, minro version and build id
  if available)

* tag 'tee-drv-misc-for-v4.17' of https://git.linaro.org:/people/jens.wiklander/linux-tee:
  tee: optee: report OP-TEE revision information
  tee: optee: GET_OS_REVISION: document a2 as a build identifier
  tee: correct max value for id allocation
---

a7e66ff96beb616067b3b2b9934f5974b2dd2758