lkml.org 
[lkml]   [2013]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [stable revert request] ... of doubled commit
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


\
 
 \ /
  Last update: 2013-03-14 23:41    [W:0.037 / U:0.872 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site