]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Ubuntu combined Linux kernel mirror