2015-04-02 04:31:11

by Namhyung Kim

[permalink] [raw]
Subject: [PATCH v2] ftracetest: Do not use usleep directly

The usleep is only provided on distros from Redhat so running ftracetest
on other distro resulted in failures due to the missing usleep.

The reason of using [u]sleep in the test was to generate (scheduler)
events. It can be done various ways like this:

yield() { pinc localhost -c 1 || sleep .001 || usleep 1 || sleep 1; }

Reported-by: Michael Ellerman <[email protected]>
Reported-by: Dave Jones <[email protected]>
Reported-by: Luis Henriques <[email protected]>
Based-on-patch-by: Pádraig Brady <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Signed-off-by: Namhyung Kim <[email protected]>
---
tools/testing/selftests/ftrace/test.d/event/event-enable.tc | 13 ++++++++++---
.../selftests/ftrace/test.d/event/subsystem-enable.tc | 13 ++++++++++---
.../selftests/ftrace/test.d/event/toplevel-enable.tc | 13 +++++++++++++
3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
index 668616d9bb03..c40c139aaf2b 100644
--- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
@@ -12,6 +12,10 @@ fail() { #msg
exit -1
}

+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
if [ ! -f set_event -o ! -d events/sched ]; then
echo "event tracing is not supported"
exit_unsupported
@@ -21,7 +25,8 @@ reset_tracer
do_reset

echo 'sched:sched_switch' > set_event
-usleep 1
+
+yield

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
@@ -31,7 +36,8 @@ fi
do_reset

echo 1 > events/sched/sched_switch/enable
-usleep 1
+
+yield

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
@@ -41,7 +47,8 @@ fi
do_reset

echo 0 > events/sched/sched_switch/enable
-usleep 1
+
+yield

count=`cat trace | grep sched_switch | wc -l`
if [ $count -ne 0 ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
index 655c415b6e7f..cbd98b71ee8a 100644
--- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
@@ -12,6 +12,10 @@ fail() { #msg
exit -1
}

+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
if [ ! -f set_event -o ! -d events/sched ]; then
echo "event tracing is not supported"
exit_unsupported
@@ -21,7 +25,8 @@ reset_tracer
do_reset

echo 'sched:*' > set_event
-usleep 1
+
+yield

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
@@ -31,7 +36,8 @@ fi
do_reset

echo 1 > events/sched/enable
-usleep 1
+
+yield

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
@@ -41,7 +47,8 @@ fi
do_reset

echo 0 > events/sched/enable
-usleep 1
+
+yield

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -ne 0 ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
index 480845774007..65e2ab666611 100644
--- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
@@ -12,6 +12,10 @@ fail() { #msg
exit -1
}

+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
echo "event tracing is not supported"
exit_unsupported
@@ -21,6 +25,9 @@ reset_tracer
do_reset

echo '*:*' > set_event
+
+yield
+
count=`cat trace | grep -v ^# | wc -l`
if [ $count -eq 0 ]; then
fail "none of events are recorded"
@@ -29,6 +36,9 @@ fi
do_reset

echo 1 > events/enable
+
+yield
+
count=`cat trace | grep -v ^# | wc -l`
if [ $count -eq 0 ]; then
fail "none of events are recorded"
@@ -37,6 +47,9 @@ fi
do_reset

echo 0 > events/enable
+
+yield
+
count=`cat trace | grep -v ^# | wc -l`
if [ $count -ne 0 ]; then
fail "any of events should not be recorded"
--
2.3.4


2015-04-02 04:43:08

by Namhyung Kim

[permalink] [raw]
Subject: [PATCH v2.1] ftracetest: Do not use usleep directly

The usleep is only provided on distros from Redhat so running ftracetest
on other distro resulted in failures due to the missing usleep.

The reason of using [u]sleep in the test was to generate (scheduler)
events. It can be done various ways like this:

yield() { ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1; }

Reported-by: Michael Ellerman <[email protected]>
Reported-by: Dave Jones <[email protected]>
Reported-by: Luis Henriques <[email protected]>
Based-on-patch-by: Pádraig Brady <[email protected]>
CC: Masami Hiramatsu <[email protected]>
Signed-off-by: Namhyung Kim <[email protected]>
---
fix a typo of pinc

tools/testing/selftests/ftrace/test.d/event/event-enable.tc | 13 ++++++++++---
.../selftests/ftrace/test.d/event/subsystem-enable.tc | 13 ++++++++++---
.../selftests/ftrace/test.d/event/toplevel-enable.tc | 13 +++++++++++++
3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
index 668616d9bb03..c40c139aaf2b 100644
--- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
@@ -12,6 +12,10 @@ fail() { #msg
exit -1
}

+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
if [ ! -f set_event -o ! -d events/sched ]; then
echo "event tracing is not supported"
exit_unsupported
@@ -21,7 +25,8 @@ reset_tracer
do_reset

echo 'sched:sched_switch' > set_event
-usleep 1
+
+yield

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
@@ -31,7 +36,8 @@ fi
do_reset

echo 1 > events/sched/sched_switch/enable
-usleep 1
+
+yield

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
@@ -41,7 +47,8 @@ fi
do_reset

echo 0 > events/sched/sched_switch/enable
-usleep 1
+
+yield

count=`cat trace | grep sched_switch | wc -l`
if [ $count -ne 0 ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
index 655c415b6e7f..cbd98b71ee8a 100644
--- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
@@ -12,6 +12,10 @@ fail() { #msg
exit -1
}

+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
if [ ! -f set_event -o ! -d events/sched ]; then
echo "event tracing is not supported"
exit_unsupported
@@ -21,7 +25,8 @@ reset_tracer
do_reset

echo 'sched:*' > set_event
-usleep 1
+
+yield

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
@@ -31,7 +36,8 @@ fi
do_reset

echo 1 > events/sched/enable
-usleep 1
+
+yield

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
@@ -41,7 +47,8 @@ fi
do_reset

echo 0 > events/sched/enable
-usleep 1
+
+yield

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -ne 0 ]; then
diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
index 480845774007..65e2ab666611 100644
--- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
+++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
@@ -12,6 +12,10 @@ fail() { #msg
exit -1
}

+yield() {
+ ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
+}
+
if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
echo "event tracing is not supported"
exit_unsupported
@@ -21,6 +25,9 @@ reset_tracer
do_reset

echo '*:*' > set_event
+
+yield
+
count=`cat trace | grep -v ^# | wc -l`
if [ $count -eq 0 ]; then
fail "none of events are recorded"
@@ -29,6 +36,9 @@ fi
do_reset

echo 1 > events/enable
+
+yield
+
count=`cat trace | grep -v ^# | wc -l`
if [ $count -eq 0 ]; then
fail "none of events are recorded"
@@ -37,6 +47,9 @@ fi
do_reset

echo 0 > events/enable
+
+yield
+
count=`cat trace | grep -v ^# | wc -l`
if [ $count -ne 0 ]; then
fail "any of events should not be recorded"
--
2.3.4

Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

(2015/04/02 13:34), Namhyung Kim wrote:
> The usleep is only provided on distros from Redhat so running ftracetest
> on other distro resulted in failures due to the missing usleep.
>
> The reason of using [u]sleep in the test was to generate (scheduler)
> events. It can be done various ways like this:
>
> yield() { ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1; }

Nice hack! :)

Acked-by: Masami Hiramatsu <[email protected]>

>
> Reported-by: Michael Ellerman <[email protected]>
> Reported-by: Dave Jones <[email protected]>
> Reported-by: Luis Henriques <[email protected]>
> Based-on-patch-by: Pádraig Brady <[email protected]>
> CC: Masami Hiramatsu <[email protected]>
> Signed-off-by: Namhyung Kim <[email protected]>
> ---
> fix a typo of pinc
>
> tools/testing/selftests/ftrace/test.d/event/event-enable.tc | 13 ++++++++++---
> .../selftests/ftrace/test.d/event/subsystem-enable.tc | 13 ++++++++++---
> .../selftests/ftrace/test.d/event/toplevel-enable.tc | 13 +++++++++++++
> 3 files changed, 33 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> index 668616d9bb03..c40c139aaf2b 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
> @@ -12,6 +12,10 @@ fail() { #msg
> exit -1
> }
>
> +yield() {
> + ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +}
> +
> if [ ! -f set_event -o ! -d events/sched ]; then
> echo "event tracing is not supported"
> exit_unsupported
> @@ -21,7 +25,8 @@ reset_tracer
> do_reset
>
> echo 'sched:sched_switch' > set_event
> -usleep 1
> +
> +yield
>
> count=`cat trace | grep sched_switch | wc -l`
> if [ $count -eq 0 ]; then
> @@ -31,7 +36,8 @@ fi
> do_reset
>
> echo 1 > events/sched/sched_switch/enable
> -usleep 1
> +
> +yield
>
> count=`cat trace | grep sched_switch | wc -l`
> if [ $count -eq 0 ]; then
> @@ -41,7 +47,8 @@ fi
> do_reset
>
> echo 0 > events/sched/sched_switch/enable
> -usleep 1
> +
> +yield
>
> count=`cat trace | grep sched_switch | wc -l`
> if [ $count -ne 0 ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> index 655c415b6e7f..cbd98b71ee8a 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
> @@ -12,6 +12,10 @@ fail() { #msg
> exit -1
> }
>
> +yield() {
> + ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +}
> +
> if [ ! -f set_event -o ! -d events/sched ]; then
> echo "event tracing is not supported"
> exit_unsupported
> @@ -21,7 +25,8 @@ reset_tracer
> do_reset
>
> echo 'sched:*' > set_event
> -usleep 1
> +
> +yield
>
> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
> if [ $count -lt 3 ]; then
> @@ -31,7 +36,8 @@ fi
> do_reset
>
> echo 1 > events/sched/enable
> -usleep 1
> +
> +yield
>
> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
> if [ $count -lt 3 ]; then
> @@ -41,7 +47,8 @@ fi
> do_reset
>
> echo 0 > events/sched/enable
> -usleep 1
> +
> +yield
>
> count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
> if [ $count -ne 0 ]; then
> diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> index 480845774007..65e2ab666611 100644
> --- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> +++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
> @@ -12,6 +12,10 @@ fail() { #msg
> exit -1
> }
>
> +yield() {
> + ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1
> +}
> +
> if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
> echo "event tracing is not supported"
> exit_unsupported
> @@ -21,6 +25,9 @@ reset_tracer
> do_reset
>
> echo '*:*' > set_event
> +
> +yield
> +
> count=`cat trace | grep -v ^# | wc -l`
> if [ $count -eq 0 ]; then
> fail "none of events are recorded"
> @@ -29,6 +36,9 @@ fi
> do_reset
>
> echo 1 > events/enable
> +
> +yield
> +
> count=`cat trace | grep -v ^# | wc -l`
> if [ $count -eq 0 ]; then
> fail "none of events are recorded"
> @@ -37,6 +47,9 @@ fi
> do_reset
>
> echo 0 > events/enable
> +
> +yield
> +
> count=`cat trace | grep -v ^# | wc -l`
> if [ $count -ne 0 ]; then
> fail "any of events should not be recorded"
>


--
Masami HIRAMATSU
Linux Technology Research Center, System Productivity Research Dept.
Center for Technology Innovation - Systems Engineering
Hitachi, Ltd., Research & Development Group
E-mail: [email protected]

2015-04-02 13:38:32

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On Thu, 02 Apr 2015 14:58:04 +0900
Masami Hiramatsu <[email protected]> wrote:

> (2015/04/02 13:34), Namhyung Kim wrote:
> > The usleep is only provided on distros from Redhat so running ftracetest
> > on other distro resulted in failures due to the missing usleep.
> >
> > The reason of using [u]sleep in the test was to generate (scheduler)
> > events. It can be done various ways like this:
> >
> > yield() { ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1; }
>
> Nice hack! :)

Yep, it was Pádraig Brady's idea.

>
> Acked-by: Masami Hiramatsu <[email protected]>

Acked-by: Steven Rostedt <[email protected]>

-- Steve

>
> >
> > Reported-by: Michael Ellerman <[email protected]>
> > Reported-by: Dave Jones <[email protected]>
> > Reported-by: Luis Henriques <[email protected]>
> > Based-on-patch-by: Pádraig Brady <[email protected]>
> > CC: Masami Hiramatsu <[email protected]>
> > Signed-off-by: Namhyung Kim <[email protected]>
> > ---

2015-04-02 14:20:15

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On 04/02/2015 07:38 AM, Steven Rostedt wrote:
> On Thu, 02 Apr 2015 14:58:04 +0900
> Masami Hiramatsu <[email protected]> wrote:
>
>> (2015/04/02 13:34), Namhyung Kim wrote:
>>> The usleep is only provided on distros from Redhat so running ftracetest
>>> on other distro resulted in failures due to the missing usleep.
>>>
>>> The reason of using [u]sleep in the test was to generate (scheduler)
>>> events. It can be done various ways like this:
>>>
>>> yield() { ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1; }
>>
>> Nice hack! :)
>
> Yep, it was Pádraig Brady's idea.
>
>>
>> Acked-by: Masami Hiramatsu <[email protected]>
>
> Acked-by: Steven Rostedt <[email protected]>
>
> -- Steve
>
>>
>>>
>>> Reported-by: Michael Ellerman <[email protected]>
>>> Reported-by: Dave Jones <[email protected]>
>>> Reported-by: Luis Henriques <[email protected]>
>>> Based-on-patch-by: Pádraig Brady <[email protected]>

Is this standard? checkpatch complained as non-standard. I am
seeing some patches posted with Based-on-patch-by

Anyway, I have this patch tagged for 4.1-rc2

thanks,
-- Shuah

--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
[email protected] | (970) 217-8978

2015-04-02 15:08:53

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On Thu, 02 Apr 2015 08:20:09 -0600
Shuah Khan <[email protected]> wrote:


> >>> Reported-by: Michael Ellerman <[email protected]>
> >>> Reported-by: Dave Jones <[email protected]>
> >>> Reported-by: Luis Henriques <[email protected]>
> >>> Based-on-patch-by: Pádraig Brady <[email protected]>
>
> 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 <[email protected]>

Also, we probably should add:

Link: http://lkml.kernel.org/r/[email protected]

Which has more of a history for this patch.

>
> Anyway, I have this patch tagged for 4.1-rc2

Why rc2?

-- Steve

2015-04-02 16:30:10

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On 04/02/2015 09:08 AM, Steven Rostedt wrote:
> On Thu, 02 Apr 2015 08:20:09 -0600
> Shuah Khan <[email protected]> wrote:
>
>
>>>>> Reported-by: Michael Ellerman <[email protected]>
>>>>> Reported-by: Dave Jones <[email protected]>
>>>>> Reported-by: Luis Henriques <[email protected]>
>>>>> Based-on-patch-by: Pádraig Brady <[email protected]>
>>
>> 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 <[email protected]>
>
> Also, we probably should add:
>
> Link: http://lkml.kernel.org/r/[email protected]
>
> 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/[email protected]

>
>>
>> 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)
[email protected] | (970) 217-8978

2015-04-02 16:48:35

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On Thu, 02 Apr 2015 10:30:05 -0600
Shuah Khan <[email protected]> wrote:

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

But the merge window closes at the rc1 release. Is this also a "stable"
thing? It should be labeled as such if that's the case.

-- Steve

2015-04-02 16:52:42

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On 04/02/2015 10:48 AM, Steven Rostedt wrote:
> On Thu, 02 Apr 2015 10:30:05 -0600
> Shuah Khan <[email protected]> wrote:
>
>>>> 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
>>
>
> But the merge window closes at the rc1 release. Is this also a "stable"
> thing? It should be labeled as such if that's the case.
>

I am treating this as a fix so rc2 would be fine, however, if I can
get the rebased patch soon I can take it in for rc1.

thanks,
-- Shuah

--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
[email protected] | (970) 217-8978

2015-04-02 17:26:20

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH v2.1] ftracetest: Do not use usleep directly

On Thu, 02 Apr 2015 10:52:38 -0600
Shuah Khan <[email protected]> wrote:


> > But the merge window closes at the rc1 release. Is this also a "stable"
> > thing? It should be labeled as such if that's the case.
> >
>
> I am treating this as a fix so rc2 would be fine, however, if I can
> get the rebased patch soon I can take it in for rc1.

That would need to come from Namhyung, who's in South Korea, and is
probably in bed right now ;-)

-- Steve