The patch titled
acpi: trivial cleanups
has been added to the -mm tree. Its filename is
acpi-trivial-cleanups.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: acpi: trivial cleanups
From: Pavel Machek <pavel@xxxxxxx>
Trivial cleanups for ACPI. Fix misspelling in printk(), fix mismerge.
Signed-off-by: Pavel Machek <pavel@xxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/processor_core.c | 2 +-
drivers/acpi/processor_idle.c | 1 -
drivers/acpi/reboot.c | 6 +++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff -puN drivers/acpi/processor_core.c~acpi-trivial-cleanups drivers/acpi/processor_core.c
--- a/drivers/acpi/processor_core.c~acpi-trivial-cleanups
+++ a/drivers/acpi/processor_core.c
@@ -123,7 +123,7 @@ struct acpi_processor_errata errata __re
static int set_no_mwait(const struct dmi_system_id *id)
{
printk(KERN_NOTICE PREFIX "%s detected - "
- "disable mwait for CPU C-stetes\n", id->ident);
+ "disabling mwait for CPU C-states\n", id->ident);
idle_nomwait = 1;
return 0;
}
diff -puN drivers/acpi/processor_idle.c~acpi-trivial-cleanups drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_idle.c~acpi-trivial-cleanups
+++ a/drivers/acpi/processor_idle.c
@@ -41,7 +41,6 @@
#include <linux/pm_qos_params.h>
#include <linux/clockchips.h>
#include <linux/cpuidle.h>
-#include <linux/cpuidle.h>
/*
* Include the apic definitions for x86 to have the APIC timer related defines
diff -puN drivers/acpi/reboot.c~acpi-trivial-cleanups drivers/acpi/reboot.c
--- a/drivers/acpi/reboot.c~acpi-trivial-cleanups
+++ a/drivers/acpi/reboot.c
@@ -1,4 +1,8 @@
-
+/*
+ * Reset the machine using the RESET_REG
+ *
+ * Distribute under GPL.
+ */
#include <linux/pci.h>
#include <linux/acpi.h>
#include <acpi/reboot.h>
_
Patches currently in -mm which might be from pavel@xxxxxxx are
origin.patch
acpi-trivial-cleanups.patch
kexec-jump-remove-duplication-of-kexec_restart_prepare.patch
pm-rework-disabling-of-user-mode-helpers-during-suspend-hibernation.patch
container-freezer-add-tif_freeze-flag-to-all-architectures.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
