* [stable revert request] ... of doubled commit
@ 2013-03-08 22:01 Jiri Slaby
2013-03-08 22:29 ` Jiri Slaby
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Slaby @ 2013-03-08 22:01 UTC (permalink / raw)
To: stable; +Cc: LKML, Tony Jones, Andrew Vagin, Steven Rostedt
Hi,
Tony Jones found that the following commit:
perf: Fix parsing of __print_flags() in TP_printk()
is applied to 3.0 twice.
Once as:
commit 248f3235861683bb1ffc7316b56bf783b162666f
Author: Steven Rostedt <srostedt@redhat.com>
Date: Fri Nov 4 16:32:25 2011 -0400
perf: Fix parsing of __print_flags() in TP_printk()
commit d06c27b22aa66e48e32f03f9387328a9af9b0625 upstream.
===== and =====
The second one is this:
commit 2431496fbdd142ccc83138d94f3f510a36ce9270
Author: Steven Rostedt <srostedt@redhat.com>
Date: Fri Nov 4 16:32:25 2011 -0400
perf: Fix parsing of __print_flags() in TP_printk()
commit 49908a1b25d448d68fd26faca260e1850201575f upstream.
=====
The latter is not an upstream commit, it is from pm-fixes, hence the
difference in commit SHAs.
2431496fbdd142ccc83138d94f3f510a36ce9270 needs to be reverted as it is
applied to a wrong function.
thanks,
--
js
suse labs
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [stable revert request] ... of doubled commit
2013-03-08 22:01 [stable revert request] ... of doubled commit Jiri Slaby
@ 2013-03-08 22:29 ` Jiri Slaby
2013-03-14 22:15 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Slaby @ 2013-03-08 22:29 UTC (permalink / raw)
To: stable; +Cc: LKML, Tony Jones, Andrew Vagin, Steven Rostedt
On 03/08/2013 11:01 PM, Jiri Slaby wrote:
> Hi,
>
> Tony Jones found that the following commit:
> perf: Fix parsing of __print_flags() in TP_printk()
> is applied to 3.0 twice.
>
> Once as:
> commit 248f3235861683bb1ffc7316b56bf783b162666f
> Author: Steven Rostedt <srostedt@redhat.com>
> Date: Fri Nov 4 16:32:25 2011 -0400
>
> perf: Fix parsing of __print_flags() in TP_printk()
>
> commit d06c27b22aa66e48e32f03f9387328a9af9b0625 upstream.
>
> ===== and =====
> The second one is this:
> commit 2431496fbdd142ccc83138d94f3f510a36ce9270
> Author: Steven Rostedt <srostedt@redhat.com>
> Date: Fri Nov 4 16:32:25 2011 -0400
>
> perf: Fix parsing of __print_flags() in TP_printk()
>
> commit 49908a1b25d448d68fd26faca260e1850201575f upstream.
>
> =====
>
> The latter is not an upstream commit, it is from pm-fixes, hence the
> difference in commit SHAs.
git command I used was not perfect. It is an upstream commit (git is
kind of confused with these two commit. So am I.). However the rest of
the email is correct.
> 2431496fbdd142ccc83138d94f3f510a36ce9270 needs to be reverted as it is
> applied to a wrong function.
>
> thanks,
--
js
suse labs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [stable revert request] ... of doubled commit
2013-03-08 22:29 ` Jiri Slaby
@ 2013-03-14 22:15 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2013-03-14 22:15 UTC (permalink / raw)
To: Jiri Slaby; +Cc: stable, LKML, Tony Jones, Andrew Vagin, Steven Rostedt
On Fri, Mar 08, 2013 at 11:29:15PM +0100, Jiri Slaby wrote:
> On 03/08/2013 11:01 PM, Jiri Slaby wrote:
> > Hi,
> >
> > Tony Jones found that the following commit:
> > perf: Fix parsing of __print_flags() in TP_printk()
> > is applied to 3.0 twice.
> >
> > Once as:
> > commit 248f3235861683bb1ffc7316b56bf783b162666f
> > Author: Steven Rostedt <srostedt@redhat.com>
> > Date: Fri Nov 4 16:32:25 2011 -0400
> >
> > perf: Fix parsing of __print_flags() in TP_printk()
> >
> > commit d06c27b22aa66e48e32f03f9387328a9af9b0625 upstream.
> >
> > ===== and =====
> > The second one is this:
> > commit 2431496fbdd142ccc83138d94f3f510a36ce9270
> > Author: Steven Rostedt <srostedt@redhat.com>
> > Date: Fri Nov 4 16:32:25 2011 -0400
> >
> > perf: Fix parsing of __print_flags() in TP_printk()
> >
> > commit 49908a1b25d448d68fd26faca260e1850201575f upstream.
> >
> > =====
> >
> > The latter is not an upstream commit, it is from pm-fixes, hence the
> > difference in commit SHAs.
>
> git command I used was not perfect. It is an upstream commit (git is
> kind of confused with these two commit. So am I.). However the rest of
> the email is correct.
Thanks for pointing this out, now reverted.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-14 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-08 22:01 [stable revert request] ... of doubled commit Jiri Slaby
2013-03-08 22:29 ` Jiri Slaby
2013-03-14 22:15 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).