Linux Power Management development
 help / color / mirror / Atom feed
From: Betty Dall <betty.dall@hp.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Len Brown <len.brown@intel.com>
Subject: Re: [PATCH 7/7] tools/power turbostat: print Watts
Date: Thu, 15 Nov 2012 13:50:46 -0700	[thread overview]
Message-ID: <1353012646.3055.25.camel@ejdallLaptop> (raw)
In-Reply-To: <f3c7bfa850840c6c96a26796786ffdc7761519ef.1352925508.git.len.brown@intel.com>

On Wed, 2012-11-14 at 15:43 -0500, Len Brown wrote:
> From: Len Brown <len.brown@intel.com>
...

> @@ -1644,7 +1967,7 @@ int main(int argc, char **argv)
>  	cmdline(argc, argv);
>  
>  	if (verbose > 1)
> -		fprintf(stderr, "turbostat v2.1 October 6, 2012"
> +		fprintf(stderr, "turbostat v3.0 November 14, 2012"
>  			" - Len Brown <lenb@kernel.org>\n");
>  
>  	turbostat_init();

I applied these 7 patches in order to a the upstream kernel and this
last hunk was rejected:

$ cat turbostat.c.rej
--- tools/power/x86/turbostat/turbostat.c
+++ tools/power/x86/turbostat/turbostat.c
@@ -1967,7 +2290,7 @@
 	cmdline(argc, argv);
 
 	if (verbose > 1)
-		fprintf(stderr, "turbostat v2.1 October 6, 2012"
+		fprintf(stderr, "turbostat v3.0 November 14, 2012"
 			" - Len Brown <lenb@xxxxxxxxxx>\n");
 
 	turbostat_init();


-Betty

  reply	other threads:[~2012-11-15 20:50 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-14 20:43 turbostat tool update for Linux-3.8 Len Brown
2012-11-14 20:43 ` [PATCH 1/7] tools/power turbostat: Repair Segmentation fault when using -i option Len Brown
2012-11-14 20:43   ` [PATCH 2/7] tools/power turbostat: graceful fail on garbage input Len Brown
2012-11-14 20:43   ` [PATCH 3/7] tools/power/x86/turbostat: use kernel MSR #defines Len Brown
2012-11-14 20:43   ` [PATCH 4/7] x86 power: define RAPL MSRs Len Brown
2012-11-14 20:43   ` [PATCH 5/7] tools: Allow tools to be installed in a user specified location Len Brown
2012-11-14 20:43   ` [PATCH 6/7] tools/power turbostat: prevent infinite loop on migration error path Len Brown
2012-11-14 20:43   ` [PATCH 7/7] tools/power turbostat: print Watts Len Brown
2012-11-15 20:50     ` Betty Dall [this message]
2012-11-15 20:37 ` turbostat tool update for Linux-3.8 Betty Dall
2012-12-17 18:34   ` Len Brown

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=1353012646.3055.25.camel@ejdallLaptop \
    --to=betty.dall@hp.com \
    --cc=len.brown@intel.com \
    --cc=lenb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    /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