From: Olof Johansson Date: Mon, 2 Jul 2018 17:18:09 +0000 (-0700) Subject: Merge tag 'tee-drv-for-4.18' of git://git.linaro.org/people/jens.wiklander/linux... X-Git-Tag: v4.19-rc1~46^2~14 X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/3287ecdf14fd40dbeca831d8cb1b1b73b1885dcb Merge tag 'tee-drv-for-4.18' of git://git.linaro.org/people/jens.wiklander/linux-tee into next/drivers Misc enhancement for tee driver subsystem * Replaces getnstimeofday64() with ktime_get_real_ts64() * Adds OPTEE_SHM_NUM_PRIV_PAGES to configure how many pages should be statically reserved for driver private allocations * tag 'tee-drv-for-4.18' of git://git.linaro.org/people/jens.wiklander/linux-tee: tee: optee: making OPTEE_SHM_NUM_PRIV_PAGES configurable via Kconfig tee: replace getnstimeofday64() with ktime_get_real_ts64() Signed-off-by: Olof Johansson --- 3287ecdf14fd40dbeca831d8cb1b1b73b1885dcb