Merge tag 'tee-fix-for-v5.10' of git://git.linaro.org:/people/jens.wiklander/linux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 26 Oct 2020 09:55:55 +0000 (10:55 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 26 Oct 2020 09:55:56 +0000 (10:55 +0100)
commit9774dd68535571307f709f25f0723d77d671009a
treee16d13c9ca10e5d65fa3ab2e48bfbe55cd105467
parent30bbbcda5be45dd2d8f060b4a39452061d72da38
parent722939528a37aa0cb22d441e2045c0cf53e78fb0
Merge tag 'tee-fix-for-v5.10' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes

Reenable kernel login method for kernel TEE client API

The kernel TEE login method was accidentally disabled previously when
enabling a few other login methods, so fix that here.

* tag 'tee-fix-for-v5.10' of git://git.linaro.org:/people/jens.wiklander/linux-tee:
  tee: client UUID: Skip REE kernel login method as well

Link: https://lore.kernel.org/r/20201013070918.GA3328976@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/tee/tee_core.c