From: Vasily Gorbik <gor@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Heiko Carstens <hca@linux.ibm.com>,
Steven Rostedt <rostedt@goodmis.org>,
Jiri Olsa <jolsa@redhat.com>,
linux-next@vger.kernel.org
Subject: Re: Upcoming merge conflict between ftrace and s390 trees
Date: Tue, 26 Oct 2021 15:42:24 +0200 [thread overview]
Message-ID: <your-ad-here.call-01635255744-ext-3853@work.hours> (raw)
In-Reply-To: <YXAqZ/EszRisunQw@osiris>
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
next prev parent reply other threads:[~2021-10-26 13:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 14:40 Upcoming merge conflict between ftrace and s390 trees Heiko Carstens
2021-10-26 13:42 ` Vasily Gorbik [this message]
2021-10-26 14:29 ` Steven Rostedt
2021-10-26 19:32 ` Steven Rostedt
2021-10-27 3:16 ` Stephen Rothwell
2021-11-02 21:02 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=your-ad-here.call-01635255744-ext-3853@work.hours \
--to=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=jolsa@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.