* linux-next: duplicate patches in the ktest tree
@ 2023-02-23 21:17 Stephen Rothwell
2023-02-23 21:24 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-02-23 21:17 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 775 bytes --]
Hi all,
The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):
bbf45b2ab467 ("ktest: Restore stty setting at first in dodie")
aa9aba938288 ("ktest.pl: Add RUN_TIMEOUT option with default unlimited")
5aa3b79933de ("ktest.pl: Give back console on Ctrt^C on monitor")
fa77cb30e4a0 ("ktest.pl: Fix missing "end_monitor" when machine check fails")
These are commits
7dc8e24f0e09 ("ktest: Restore stty setting at first in dodie")
4e7d2a8f0b52 ("ktest.pl: Add RUN_TIMEOUT option with default unlimited")
83d29d439cd3 ("ktest.pl: Give back console on Ctrt^C on monitor")
e8bf9b98d40d ("ktest.pl: Fix missing "end_monitor" when machine check fails")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patches in the ktest tree
2023-02-23 21:17 linux-next: duplicate patches in the ktest tree Stephen Rothwell
@ 2023-02-23 21:24 ` Steven Rostedt
2023-02-23 21:29 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2023-02-23 21:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Fri, 24 Feb 2023 08:17:08 +1100
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
>
> bbf45b2ab467 ("ktest: Restore stty setting at first in dodie")
> aa9aba938288 ("ktest.pl: Add RUN_TIMEOUT option with default unlimited")
> 5aa3b79933de ("ktest.pl: Give back console on Ctrt^C on monitor")
> fa77cb30e4a0 ("ktest.pl: Fix missing "end_monitor" when machine check fails")
>
> These are commits
>
> 7dc8e24f0e09 ("ktest: Restore stty setting at first in dodie")
> 4e7d2a8f0b52 ("ktest.pl: Add RUN_TIMEOUT option with default unlimited")
> 83d29d439cd3 ("ktest.pl: Give back console on Ctrt^C on monitor")
> e8bf9b98d40d ("ktest.pl: Fix missing "end_monitor" when machine check fails")
>
> in Linus' tree.
>
Ah sorry. When I was doing my pull request for Linus, I realized I
accidentally had a commit that wasn't to go upstream. I rebased to remove
it, but never updated my for-next branch.
Doing that now.
-- Steve
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: duplicate patches in the ktest tree
2023-02-23 21:24 ` Steven Rostedt
@ 2023-02-23 21:29 ` Steven Rostedt
0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2023-02-23 21:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Thu, 23 Feb 2023 16:24:52 -0500
Steven Rostedt <rostedt@goodmis•org> wrote:
> On Fri, 24 Feb 2023 08:17:08 +1100
> Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Ah sorry. When I was doing my pull request for Linus, I realized I
> accidentally had a commit that wasn't to go upstream. I rebased to remove
> it, but never updated my for-next branch.
The commit message even had:
ktest.pl: Process variables within variables
Allow a variable to contain another variable. This will allow the
${shell <command>} to have its command include variables.
[ When I remember the use case for this, I'll send out the real patch ]
Which is what reminded me that it wasn't suppose to have been in for-next
to begin with.
>
> Doing that now.
Done.
-- Steve
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-23 21:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-23 21:17 linux-next: duplicate patches in the ktest tree Stephen Rothwell
2023-02-23 21:24 ` Steven Rostedt
2023-02-23 21:29 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox