[GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1

[GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1

[Len Brown]

Hi Linus,

Please pull these ACPI & Power Management bug fixes.

thanks!
Len Brown, Intel Open Source Technology Center

The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f:

  Linux 3.5-rc1 (2012-06-02 18:29:26 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git release

for you to fetch changes up to d3514abcf5b896a3a66d8b7c960a0018a52ebc2c:

  Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release (2012-06-04 00:48:41 -0400)

----------------------------------------------------------------

Alan Cox (3):
      acpi_video: fix leaking PCI references
      acpi_video: Intel video is not always i915
      gma500: don't register the ACPI video bus

Andy Whitcroft (1):
      ACPI battery: only refresh the sysfs files when pertinent information changes

Dan Carpenter (1):
      ACPI video: use after input_unregister_device()

Daniel Drake (2):
      ACPI / PM: Generate wakeup events on fixed power button
      rtc-cmos / PM: report wakeup event on ACPI RTC alarm

Fabio Estevam (1):
      drivers: acpi: Fix dependency for ACPI_HOTPLUG_CPU

Len Brown (5):
      tools/power turbostat: fix un-intended affinity of forked program
      tools/power turbostat: fix IVB support
      ACPI: fix acpi_bus.h build warnings when ACPI is not enabled
      Merge branch 'upstream' into bugfix-video
      Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat', 'bugfix-video' and 'workaround-pss' into release

Marco Aurelio da Costa (1):
      ACPI: Ignore invalid _PSS entries, but use valid ones

Rafael J. Wysocki (3):
      ACPI / PM: Fix error messages in drivers/acpi/bus.c
      ACPI / PM: Make __acpi_bus_get_power() cover D3cold correctly
      ACPI / PM: Make acpi_pm_device_sleep_state() follow the specification

 drivers/acpi/Kconfig                  |  2 +-
 drivers/acpi/battery.c                | 10 +++-
 drivers/acpi/bus.c                    | 88 +++++++++++++++++++++++------------
 drivers/acpi/power.c                  |  2 +-
 drivers/acpi/processor_perflib.c      | 30 ++++++++++--
 drivers/acpi/scan.c                   |  1 +
 drivers/acpi/sleep.c                  | 49 +++++++++++++++++--
 drivers/acpi/video.c                  | 33 ++++++++-----
 drivers/gpu/drm/gma500/psb_drv.c      |  3 +-
 drivers/rtc/rtc-cmos.c                |  9 ++--
 include/acpi/acpi_bus.h               |  4 +-
 tools/power/x86/turbostat/turbostat.c | 30 +++++++++++-
 12 files changed, 199 insertions(+), 62 deletions(-)

Re: [GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1

[Linus Torvalds]

On Mon, Jun 4, 2012 at 8:34 AM, Len Brown <lenb@kernel.org> wrote:
>      Merge branch 'upstream' into bugfix-video

So I *think* this merge is a mismerge, but I want to verify with Alan.

I think the drivers/gpu/drm/gma500/psb_drv.c should be taken from
current mainline: you commented out the call to
"acpi_video_register()", and while it is true that both branches did
comment that line out, mainline actually has further changes
*afterwards* that put it back in again. Notably commit d839ede47a56
("gma500: opregion and ACPI").

So I *think* that the resolution to that merge should have been to
just take everything from mainline.

Alan? Can you check out the tree at

    git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git release

or are you still busy with the queen?

               Linus

Re: [GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1

[Alan Cox]

> Alan? Can you check out the tree at
> 
>     git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git release
> 
> or are you still busy with the queen?

Nope. Just missed the email. Len poked me about it now. You are correct
that the acpi_video_register should be back as per the later commit - it
got re-enabled.

I spent the holiday avoiding the English queen's party and turning from a
republican into a raving republican 8).

Alan

Re: [GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1

[Linus Torvalds]

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

On Fri, Jun 8, 2012 at 9:57 AM, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> I spent the holiday avoiding the English queen's party and turning from a
> republican into a raving republican 8).

Sure you did. Except I have photographic evidence to the contrary.

                Linus

[-- Attachment #2: Alan.jpg --]
[-- Type: image/jpeg, Size: 88407 bytes --]