]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c1cccd 9836c63)
Merge tag 'optee-tracepoints-fix-for-v5.13' of git://git.linaro.org/people/jens.wikla...
authorArnd Bergmann <arnd@arndb.de>
Thu, 1 Apr 2021 09:51:40 +0000 (11:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 1 Apr 2021 14:38:47 +0000 (16:38 +0200)
commit391e40ddb6bc151a576f469af667e9801f464c2f
tree58ac5be8468466282f3420476e74d92700d030fetree | snapshot
parent4c1cccd82c4bd262ccb1b5600160414f30d0360ecommit | diff
parent9836c63723d3eaaa106713dcb72963d4d424685fcommit | diff
Merge tag 'optee-tracepoints-fix-for-v5.13' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Fixes build error for recently added OP-TEE tracepoints

* tag 'optee-tracepoints-fix-for-v5.13' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: fix build error caused by recent optee tracepoints feature

Link: https://lore.kernel.org/r/20210330082208.GA965793@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Linux Kernel Source Tree.