From: Shuah Khan <shuahkh@osg.samsung.com>
To: Steven Rostedt <rostedt@goodmis.org>, Namhyung Kim <namhyung@kernel.org>
Cc: "Masami Hiramatsu" <masami.hiramatsu.pt@hitachi.com>,
LKML <linux-kernel@vger.kernel.org>,
"Pádraig Brady" <P@draigBrady.com>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Dave Jones" <davej@codemonkey.org.uk>,
"Luis Henriques" <luis.henriques@canonical.com>,
"Shuah Khan" <shuahkh@osg.samsung.com>
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly
Date: Thu, 02 Apr 2015 10:30:05 -0600 [thread overview]
Message-ID: <551D6E8D.6040504@osg.samsung.com> (raw)
In-Reply-To: <20150402110846.4e6a756c@gandalf.local.home>
On 04/02/2015 09:08 AM, Steven Rostedt wrote:
> On Thu, 02 Apr 2015 08:20:09 -0600
> Shuah Khan <shuahkh@osg.samsung.com> wrote:
>
>
>>>>> Reported-by: Michael Ellerman <mpe@ellerman.id.au>
>>>>> Reported-by: Dave Jones <davej@codemonkey.org.uk>
>>>>> Reported-by: Luis Henriques <luis.henriques@canonical.com>
>>>>> Based-on-patch-by: Pádraig Brady <P@draigBrady.com>
>>
>> Is this standard? checkpatch complained as non-standard. I am
>> seeing some patches posted with Based-on-patch-by
>
> I ignore checkpatch for things like this. It doesn't have a foggiest
> clue to what is standard. The only standard we truly have that counts
> is "Signed-off-by", as that's partially a legal thing. Everything else
> is info only.
>
> This patch was based on a idea by Pádraig Brady and Namhyung is giving
> him credit.
>
> Hmm, since I do not believe that Pádraig sent a patch, but only
> suggested the idea, the more "standard" tag, and actually more
> appropriate tag would be:
>
> Suggested-by: Pádraig Brady <P@draigBrady.com>
>
> Also, we probably should add:
>
> Link: http://lkml.kernel.org/r/1427329943-16896-1-git-send-email-namhyung@kernel.org
>
> Which has more of a history for this patch.
I added the following to the commit log:
For more information on the history of this patch, please refer to:
http://lkml.kernel.org/r/1427329943-16896-1-git-send-email-namhyung@kernel.org
>
>>
>> Anyway, I have this patch tagged for 4.1-rc2
>
> Why rc2?
I usually let the patches stay in next for a few days before
I send pull request. It is getting close to that, so decided
on rc2 as a better choice.
We are at rc-6 at the moment, maybe there is enough time for
this to get into rc-1
This patch has been in the works for a while now. Might as well
get it in.
Bummer. Now this patch conflicts with the following commits:
ftracetest: Convert exit -1 to exit $FAIL
ftracetest: Add basic event tracing test cases
Applying: ftracetest: Do not use usleep directly
error: patch failed:
tools/testing/selftests/ftrace/test.d/event/event-enable.tc:12
error: tools/testing/selftests/ftrace/test.d/event/event-enable.tc:
patch does not apply
error: patch failed:
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc:12
error: tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc:
patch does not apply
error: patch failed:
tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc:12
error: tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc:
patch does not apply
I could attempt to fix the conflicts, however prefer if you can
rebase it on linux-kselftest next.
thanks,
-- Shuah
--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978
next prev parent reply other threads:[~2015-04-02 16:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 4:24 [PATCH v2] ftracetest: Do not use usleep directly Namhyung Kim
2015-04-02 4:34 ` [PATCH v2.1] " Namhyung Kim
2015-04-02 5:58 ` Masami Hiramatsu
2015-04-02 13:38 ` Steven Rostedt
2015-04-02 14:20 ` Shuah Khan
2015-04-02 15:08 ` Steven Rostedt
2015-04-02 16:30 ` Shuah Khan [this message]
2015-04-02 16:48 ` Steven Rostedt
2015-04-02 16:52 ` Shuah Khan
2015-04-02 17:26 ` Steven Rostedt
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=551D6E8D.6040504@osg.samsung.com \
--to=shuahkh@osg.samsung.com \
--cc=P@draigBrady.com \
--cc=davej@codemonkey.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.henriques@canonical.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mpe@ellerman.id.au \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox