projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 10f765d 7ccdcaa)
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)
commit56a6867beecf06b81348b79be19afd12b1f9ae2f
tree58ac5be8468466282f3420476e74d92700d030fetree | snapshot
parent10f765d68ba218fc0125b0193a058c82cc3b481dcommit | diff
parent7ccdcaace80810175bd20b2ece856b42edd43991commit | 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>
Domain: System / Kernel;