OSDN Git Service

Merge tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people...
authorOlof Johansson <olof@lixom.net>
Fri, 12 Jan 2018 02:05:06 +0000 (18:05 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 12 Jan 2018 02:05:06 +0000 (18:05 -0800)
This pull request updates the previous tee-drv-dynamic-shm-for-v4.16 pull
request with five new patches fixing review comments and errors.

Apart from three small fixes there's two larger patches that in the end
checks that memory to be registered really is normal cached memory.

* tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: shm: Potential NULL dereference calling tee_shm_register()
  tee: shm: don't put_page on null shm->pages
  tee: shm: make function __tee_shm_alloc static
  tee: optee: check type of registered shared memory
  tee: add start argument to shm_register callback

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
drivers/tee/optee/call.c
drivers/tee/optee/optee_private.h
include/linux/tee_drv.h

Simple merge
Simple merge
Simple merge