[GIT PULL] OP-TEE tracepoints fix for v5.13

[GIT PULL] OP-TEE tracepoints fix for v5.13

[Jens Wiklander]

Hello arm-soc maintainers,

The previous pull request for OP-TEE tracepoints introduced a build
error when building whithout O=..., apparently many regression builds
uses that option.

Please pull this small fix for the build error.

Thanks,
Jens

The following changes since commit 0101947dbcc3204f08fb5b69a21dbd4b1535cad6:

  tee: optee: add invoke_fn tracepoints (2021-03-15 12:04:01 +0100)

are available in the Git repository at:

  git://git.linaro.org/people/jens.wiklander/linux-tee.git/ tags/optee-tracepoints-fix-for-v5.13

for you to fetch changes up to 7ccdcaace80810175bd20b2ece856b42edd43991:

  tee: optee: fix build error caused by recent optee tracepoints feature (2021-03-30 09:33:33 +0200)

----------------------------------------------------------------
Fixes build error for recently added OP-TEE tracepoints

----------------------------------------------------------------
Jisheng Zhang (1):
      tee: optee: fix build error caused by recent optee tracepoints feature

 drivers/tee/optee/Makefile | 3 +++
 1 file changed, 3 insertions(+)

Re: [GIT PULL] OP-TEE tracepoints fix for v5.13

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

On Tue, 30 Mar 2021 10:22:08 +0200, Jens Wiklander wrote:
> The previous pull request for OP-TEE tracepoints introduced a build
> error when building whithout O=..., apparently many regression builds
> uses that option.
> 
> Please pull this small fix for the build error.
> 
> Thanks,
> Jens
> 
> [...]

You asked for this to be merged for 5.13, but as the change is clearly correct
and required as a build fix, I added it as a fix for 5.12 instead, hope that's
ok.

Merged into arm/fixes, thanks!

merge commit: 3e530f89d72dd1ab31e20d6f8567e357b928705c

       Arnd

Re: [GIT PULL] OP-TEE tracepoints fix for v5.13

[Jens Wiklander]

On Thu, Apr 1, 2021 at 12:23 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> On Tue, 30 Mar 2021 10:22:08 +0200, Jens Wiklander wrote:
> > The previous pull request for OP-TEE tracepoints introduced a build
> > error when building whithout O=..., apparently many regression builds
> > uses that option.
> >
> > Please pull this small fix for the build error.
> >
> > Thanks,
> > Jens
> >
> > [...]
>
> You asked for this to be merged for 5.13, but as the change is clearly correct
> and required as a build fix, I added it as a fix for 5.12 instead, hope that's
> ok.
>
> Merged into arm/fixes, thanks!
>
> merge commit: 3e530f89d72dd1ab31e20d6f8567e357b928705c

OK. Please note that this pulls in 0101947dbcc3 ("tee: optee: add
invoke_fn tracepoints") (the commit just before actually) which I
believe was queued for v5.13.

Cheers,
Jens

Re: [GIT PULL] OP-TEE tracepoints fix for v5.13

[Jens Wiklander]

On Thu, Apr 1, 2021 at 12:23 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> On Tue, 30 Mar 2021 10:22:08 +0200, Jens Wiklander wrote:
> > The previous pull request for OP-TEE tracepoints introduced a build
> > error when building whithout O=..., apparently many regression builds
> > uses that option.
> >
> > Please pull this small fix for the build error.
> >
> > Thanks,
> > Jens
> >
> > [...]
>
> You asked for this to be merged for 5.13, but as the change is clearly correct
> and required as a build fix, I added it as a fix for 5.12 instead, hope that's
> ok.
>
> Merged into arm/fixes, thanks!
>
> merge commit: 3e530f89d72dd1ab31e20d6f8567e357b928705c

OK. Please note that this pulls in 0101947dbcc3 ("tee: optee: add
invoke_fn tracepoints") (the commit just before actually) which I
believe was queued for v5.13.

Cheers,
Jens

Re: [GIT PULL] OP-TEE tracepoints fix for v5.13

[Arnd Bergmann]

On Thu, Apr 1, 2021 at 2:32 PM Jens Wiklander <jens.wiklander@linaro.org> wrote:
> On Thu, Apr 1, 2021 at 12:23 PM Arnd Bergmann <arnd@kernel.org> wrote:
> >
> > merge commit: 3e530f89d72dd1ab31e20d6f8567e357b928705c
>
> OK. Please note that this pulls in 0101947dbcc3 ("tee: optee: add
> invoke_fn tracepoints") (the commit just before actually) which I
> believe was queued for v5.13.

Of course, that explains it. I'll take it out of the fixes branch again then
and apply it on top of the original merge in the drivers branch instead.

Thanks for the clarification!

         Arnd