On Wed, 20 Oct 2021 16:40:39 +0200
Heiko Carstens [off-list ref] wrote:

Hi Stephen,

just as heads-up: there will be an upcoming merge conflict between
ftrace and s390 trees in linux-next which will cause a compile error
for s390.

With the s390 tree this commit is already in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=c316eb4460463b6dd1aee6d241cb20323a0030aa

And soon this patch will likely be within the ftrace tree:
https://lore.kernel.org/lkml/20211008091336.33616-9-jolsa@kernel.org/ (local)

Maybe Steven could reply to this when he applies it.

BTW, is this in your tree, or would you like me to take this through my
tree?

If so, I need a proper patch.

-- Steve