stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: stable <stable@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Tony Jones <tonyj@suse.de>,
	Andrew Vagin <avagin@openvz.org>,
	Steven Rostedt <rostedt@goodmis.org>
Subject: [stable revert request] ... of doubled commit
Date: Fri, 08 Mar 2013 23:01:43 +0100	[thread overview]
Message-ID: <513A5FC7.8040409@suse.cz> (raw)

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

             reply	other threads:[~2013-03-08 22:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-08 22:01 Jiri Slaby [this message]
2013-03-08 22:29 ` [stable revert request] ... of doubled commit Jiri Slaby
2013-03-14 22:15   ` Greg KH

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=513A5FC7.8040409@suse.cz \
    --to=jslaby@suse.cz \
    --cc=avagin@openvz.org \
    --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;
as well as URLs for NNTP newsgroup(s).