On Sat, Jun 16, 2012 at 10:36:21PM +0200, Rafael J. Wysocki wrote: > On Saturday, June 16, 2012, Rafael J. Wysocki wrote: > > On Friday, June 15, 2012, Greg KH wrote: > > > On Fri, Jun 15, 2012 at 12:00:20PM +0200, Rafael J. Wysocki wrote: > > > > On Friday, June 15, 2012, Greg KH wrote: > > > > > On Wed, May 23, 2012 at 09:45:32AM -0700, Sameer Nanda wrote: > > > > > > Added a new knob called /sys/power/pm_print_times. Setting it to 1 > > > > > > enables printing of time taken by devices to suspend and resume. > > > > > > Setting it to 0 disables this printing (unless overridden by > > > > > > initcall_debug kernel command line option). > > > > > > > > > > > > Signed-off-by: Sameer Nanda <snanda@xxxxxxxxxxxx> > > > > > > cc: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > > > cc: Rafael J. Wysocki <rjw@xxxxxxx> > > > > > > cc: Steven Rostedt <rostedt@xxxxxxxxxxx> > > > > > > --- > > > > > > Documentation/ABI/testing/sysfs-power | 13 ++++++++++++ > > > > > > drivers/base/power/main.c | 4 +- > > > > > > drivers/base/power/power.h | 11 ++++++++++ > > > > > > kernel/power/main.c | 34 +++++++++++++++++++++++++++++++++ > > > > > > 4 files changed, 60 insertions(+), 2 deletions(-) > > > > > > > > > > This patch fails against the linux-next tree, care to fix it up so that > > > > > I can apply it? > > > > > > > > I'd prefer it to go through my tree if you don't mind. > > > > > > Not at all, feel free to put: > > > > > > Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > > > When it shows up again. > > > > I've just used the original one, it only needed a documentation merge conflict > > fixed. > > > > Queued up for 3.6. > > I propose the following patch on top of this one. The details are in the > changelog. > > If anyone has any objections, please let me know. No objection from me at all, thanks for cleaning this up: Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
