From patchwork Thu Nov 15 20:50:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Betty Dall X-Patchwork-Id: 1751651 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5A3783FCA5 for ; Thu, 15 Nov 2012 21:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367Ab2KOU7m (ORCPT ); Thu, 15 Nov 2012 15:59:42 -0500 Received: from g5t0007.atlanta.hp.com ([15.192.0.44]:36238 "EHLO g5t0007.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985Ab2KOU7l (ORCPT ); Thu, 15 Nov 2012 15:59:41 -0500 Received: from g5t0029.atlanta.hp.com (g5t0029.atlanta.hp.com [16.228.8.141]) by g5t0007.atlanta.hp.com (Postfix) with ESMTP id E918D14032; Thu, 15 Nov 2012 20:50:57 +0000 (UTC) Received: from [16.71.13.57] (swa01cs006-da01.atlanta.hp.com [16.114.29.156]) by g5t0029.atlanta.hp.com (Postfix) with ESMTP id 8978E2049F; Thu, 15 Nov 2012 20:50:57 +0000 (UTC) Message-ID: <1353012646.3055.25.camel@ejdallLaptop> Subject: Re: [PATCH 7/7] tools/power turbostat: print Watts From: Betty Dall To: Len Brown Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Len Brown Date: Thu, 15 Nov 2012 13:50:46 -0700 In-Reply-To: References: <39300ffb9b6666714c60735cf854e1280e4e75f4.1352925508.git.len.brown@intel.com> X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Wed, 2012-11-14 at 15:43 -0500, Len Brown wrote: > From: Len Brown ... > @@ -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 \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 -Betty --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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 \n"); turbostat_init();