From: Greg KH <greg@kroah.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: stable <stable@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>, Tony Jones <tonyj@suse.de>,
Andrew Vagin <avagin@openvz.org>,
Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [stable revert request] ... of doubled commit
Date: Thu, 14 Mar 2013 15:15:01 -0700 [thread overview]
Message-ID: <20130314221501.GA30053@kroah.com> (raw)
In-Reply-To: <513A663B.3090506@suse.cz>
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
prev parent reply other threads:[~2013-03-14 22:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20130314221501.GA30053@kroah.com \
--to=greg@kroah.com \
--cc=avagin@openvz.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
--cc=tonyj@suse.de \
/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