From: Greg KH <gregkh@linuxfoundation.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] tracing/samples: Fix creation and deletion of" failed to apply to 4.9-stable tree
Date: Tue, 31 Oct 2017 17:22:37 +0100 [thread overview]
Message-ID: <20171031162237.GA3035@kroah.com> (raw)
In-Reply-To: <20171031114236.5e6fbaa5@gandalf.local.home>
On Tue, Oct 31, 2017 at 11:42:36AM -0400, Steven Rostedt wrote:
>
> Below is the fix. The only conflict between 4.9 and Linus's tree was
> that foo_bar_reg() changed from a void to returning int.
>
> Also, I folded in Linus's fix of having simple_thread_cnt be int and
> not bool. You can remove that if you want to add Linus's commit on top.
I would rather add Linus's commit on top, thanks.
> I'm guessing this should also work for 4.4 as well?
I'll try it after this next round of kernels are released, thanks.
greg k-h
prev parent reply other threads:[~2017-10-31 16:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 7:41 FAILED: patch "[PATCH] tracing/samples: Fix creation and deletion of" failed to apply to 4.9-stable tree gregkh
2017-10-31 15:42 ` Steven Rostedt
2017-10-31 16:22 ` Greg KH [this message]
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=20171031162237.GA3035@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
/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.