From: Arnd Bergmann Date: Thu, 1 Apr 2021 09:51:40 +0000 (+0200) Subject: Merge tag 'optee-tracepoints-fix-for-v5.13' of git://git.linaro.org/people/jens.wikla... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=56a6867beecf06b81348b79be19afd12b1f9ae2f;p=linux.git 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 --- 56a6867beecf06b81348b79be19afd12b1f9ae2f