From: Steven Rostedt <rostedt@goodmis.org>
To: Vaibhav Nagarnaik <vnagarnaik@google.com>
Cc: Justin Teravest <teravest@google.com>,
David Sharp <dhsharp@google.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] Revert "trace-cmd: Add function declaration to fix compile warning"
Date: Mon, 21 May 2012 10:14:45 -0400 [thread overview]
Message-ID: <1337609685.5576.1.camel@gandalf.stny.rr.com> (raw)
In-Reply-To: <1332188923-13375-1-git-send-email-vnagarnaik@google.com>
On Mon, 2012-03-19 at 13:28 -0700, Vaibhav Nagarnaik wrote:
> This reverts commit 1fc4fb039bfa3f0358d7e9810de71c58a7b32b64.
>
> Steven added commit ba911ea7fc1fdd13e3bce1b2001f5b432df8edae which does
> exactly the same thing. Now we end up with a duplicate declaration of
> the function trace_util_ftrace_options(). Reverting the commit gets rid
> of the warning.
Cleaning out my INBOX again, and came across these two patches. I
applied them now.
My INBOX gets blasted sometimes, and I miss patches like this. Don't be
afraid to ping me after a week if I don't apply them.
Or if you don't mind waiting a few months, where I start cleaning out my
INBOX, I'll apply them when I come across them again ;-)
-- Steve
>
> Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
> ---
> trace-cmd.h | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/trace-cmd.h b/trace-cmd.h
> index 3f522ee..f904dc5 100644
> --- a/trace-cmd.h
> +++ b/trace-cmd.h
> @@ -218,7 +218,6 @@ long tracecmd_flush_recording(struct tracecmd_recorder *recorder);
> /* --- Plugin handling --- */
> extern struct plugin_option trace_ftrace_options[];
>
> -void trace_util_ftrace_options(void);
> void trace_util_add_option(const char *name, const char *val);
> void trace_util_load_plugins(struct pevent *pevent, const char *suffix,
> void (*load_plugin)(struct pevent *pevent,
next prev parent reply other threads:[~2012-05-21 14:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 20:28 Vaibhav Nagarnaik
2012-03-19 20:28 ` [PATCH 2/2] trace-cmd: Close the trace file descriptor Vaibhav Nagarnaik
2012-05-21 14:14 ` Steven Rostedt [this message]
2012-05-21 17:33 ` [PATCH 1/2] Revert "trace-cmd: Add function declaration to fix compile warning" Vaibhav Nagarnaik
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=1337609685.5576.1.camel@gandalf.stny.rr.com \
--to=rostedt@goodmis.org \
--cc=dhsharp@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=teravest@google.com \
--cc=vnagarnaik@google.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®