next-20140409 Bad Kconfig help text in drivers/acpi/Kconfig

next-20140409 Bad Kconfig help text in drivers/acpi/Kconfig

[Valdis Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 807 bytes --]

So this commit landed in linux-next recently:

commit e2a7c3d7812369daae56f069eab2e8f3e548d231
Author: Lan Tianyu <tianyu.lan@intel.com>
Date:   Sun May 4 11:07:24 2014 +0800

    ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"

    The commit 1e2d9cd and 7d7ee95 remove ACPI Proc Battery
    directory and breaks some old userspace tools. This patch
    is to revert 7d7ee95.

    Fixes: 7d7ee958867a (ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c)

The problem is that it really needs a follow-on patch to fix this help text:

    This option has no effect on /proc/acpi/ directories
    and functions, which do not yet exist in /sys
    This option, together with the proc directories, will be
    deleted in 2.6.39.

Somebody want to pick a new release target and try again?




[-- Attachment #2: Type: application/pgp-signature, Size: 848 bytes --]

Re: next-20140409 Bad Kconfig help text in drivers/acpi/Kconfig

[Rafael J. Wysocki]

On Friday, May 09, 2014 02:26:50 PM Valdis Kletnieks wrote:
> 
> --==_Exmh_1399660010_2033P
> Content-Type: text/plain; charset=us-ascii
> 
> So this commit landed in linux-next recently:
> 
> commit e2a7c3d7812369daae56f069eab2e8f3e548d231
> Author: Lan Tianyu <tianyu.lan@intel.com>
> Date:   Sun May 4 11:07:24 2014 +0800
> 
>     ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"
> 
>     The commit 1e2d9cd and 7d7ee95 remove ACPI Proc Battery
>     directory and breaks some old userspace tools. This patch
>     is to revert 7d7ee95.
> 
>     Fixes: 7d7ee958867a (ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c)
> 
> The problem is that it really needs a follow-on patch to fix this help text:
> 
>     This option has no effect on /proc/acpi/ directories
>     and functions, which do not yet exist in /sys
>     This option, together with the proc directories, will be
>     deleted in 2.6.39.
> 
> Somebody want to pick a new release target and try again?

Do you mean something like this:

---
 drivers/acpi/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/drivers/acpi/Kconfig
===================================================================
--- linux-pm.orig/drivers/acpi/Kconfig
+++ linux-pm/drivers/acpi/Kconfig
@@ -60,7 +60,7 @@ config ACPI_PROCFS_POWER
 	  This option has no effect on /proc/acpi/ directories
 	  and functions, which do not yet exist in /sys
 	  This option, together with the proc directories, will be
-	  deleted in 2.6.39.
+	  deleted in the future.
 
 	  Say N to delete power /proc/acpi/ directories that have moved to /sys/