Re: Upcoming merge conflict between ftrace and s390 trees

Vasily Gorbik
2021-10-26T13:43:01Z

On Wed, Oct 20, 2021 at 04:40:39PM +0200, Heiko Carstens wrote:
> 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/
>
> Maybe Steven could reply to this when he applies it.

Hi Stephen,

could you please pick up this fixup from Heiko in linux-next on top of
s390 tree? ftrace changes mentioned are now in linux-next and this fixup
is needed to avoid s390 build error.

Thank you,
Vasily