From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36179 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751942AbbGaAUw (ORCPT ); Thu, 30 Jul 2015 20:20:52 -0400 Subject: Patch "tracing: Fix typo from "static inlin" to "static inline"" has been added to the 4.1-stable tree To: rostedt@goodmis.org, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 30 Jul 2015 17:20:50 -0700 Message-ID: <143830205021124@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled tracing: Fix typo from "static inlin" to "static inline" to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tracing-fix-typo-from-static-inlin-to-static-inline.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From cc9e4bde03f2b4cfba52406c021364cbd2a4a0f3 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (Red Hat)" Date: Thu, 25 Jun 2015 18:19:37 -0400 Subject: tracing: Fix typo from "static inlin" to "static inline" From: "Steven Rostedt (Red Hat)" commit cc9e4bde03f2b4cfba52406c021364cbd2a4a0f3 upstream. The trace.h header when called without CONFIG_EVENT_TRACING enabled (seldom done), will not compile because of a typo in the protocol of trace_event_enum_update(). Signed-off-by: Steven Rostedt Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1312,7 +1312,7 @@ void trace_event_init(void); void trace_event_enum_update(struct trace_enum_map **map, int len); #else static inline void __init trace_event_init(void) { } -static inlin void trace_event_enum_update(struct trace_enum_map **map, int len) { } +static inline void trace_event_enum_update(struct trace_enum_map **map, int len) { } #endif extern struct trace_iterator *tracepoint_print_iter; Patches currently in stable-queue which might be from rostedt@goodmis.org are queue-4.1/tracing-have-branch-tracer-use-recursive-field-of-task-struct.patch queue-4.1/tracing-fix-sample-output-of-dynamic-arrays.patch queue-4.1/tracing-filter-do-not-allow-infix-to-exceed-end-of-string.patch queue-4.1/tracing-fix-typo-from-static-inlin-to-static-inline.patch queue-4.1/tracing-filter-do-not-warn-on-operand-count-going-below-zero.patch