All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Vasily Gorbik <gor@linux.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Heiko Carstens <hca@linux.ibm.com>, 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 10:29:52 -0400	[thread overview]
Message-ID: <20211026102952.78eb9fd4@gandalf.local.home> (raw)
In-Reply-To: <your-ad-here.call-01635255744-ext-3853@work.hours>

On Tue, 26 Oct 2021 15:42:24 +0200
Vasily Gorbik <gor@linux.ibm.com> wrote:

> 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.

Ah, I missed this.

Yes, I have that code pushed to my for-next branch.

-- Steve

  reply	other threads:[~2021-10-26 14:30 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
2021-10-26 14:29   ` Steven Rostedt [this message]
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=20211026102952.78eb9fd4@gandalf.local.home \
    --to=rostedt@goodmis.org \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=jolsa@redhat.com \
    --cc=linux-next@vger.kernel.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.