* [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge
@ 2012-03-30 11:38 Len Brown
2012-03-30 16:48 ` Rob Lee
2012-03-30 19:16 ` Linus Torvalds
0 siblings, 2 replies; 7+ messages in thread
From: Len Brown @ 2012-03-30 11:38 UTC (permalink / raw)
To: Linus Torvalds, Daniel Lezcano, Robert Lee
Cc: linux-acpi, Linux PM list, linux-kernel
Hi Linus,
Please pull these ACPI & Power Management patches.
ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup
cpuidle evolving, more ARM use
thermal sub-system evolving, ditto
assorted other PM bits
The top commit is a merge with your latest tree
to address some cpuidle/ARM conflicts.
Rob, Daniel,
As you both modified at91_enter_idle(), and I don't know the semantics
of at91_standby(), I had to guess at the correct merge.
Please double check it and correct as necessary.
thanks!
Len Brown, Intel Open Source Technology Center
The following changes since commit f52b69f86e27903d6896ed5fa7cd280fec8de532:
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (2012-03-30 00:09:17 -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 14b5e206d755327ca176920ce2984c55191bbe1d:
Merge branch 'upstream' into release (2012-03-30 07:00:19 -0400)
----------------------------------------------------------------
Alex He (1):
ACPI: Clean redundant codes in scan.c
Amit Daniel Kachhap (1):
thermal: Fix for setting the thermal zone mode to enable/disable
Andi Kleen (3):
ACPI: ec: Do request_region outside WARN()
ACPI: Make ACPI interrupt threaded
Disable MCP limit exceeded messages from Intel IPS driver
Bjorn Helgaas (1):
ACPI / PM: print physical addresses consistently with other parts of kernel
Bob Moore (16):
ACPICA: Update _REV return value to 5
ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers
ACPICA: Move ACPI timer prototypes to public acpixf file
ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware
ACPICA: Expand OSL memory read/write interfaces to 64 bits
ACPICA: ACPI 5: Update debug output for new notify values
ACPICA: Add acpi_os_physical_table_override interface
ACPICA: Distill multiple sleep method functions to a single function
ACPICA: Split sleep/wake functions into two files
ACPICA: Add table-driven dispatch for sleep/wake functions
ACPICA: Update to version 20120215
ACPICA: Clarify METHOD_NAME* defines for full-pathname cases
ACPICA: Change exception code for invalid pathname in acpi_evaluate_object
ACPICA: Debugger: Add missing object info to namespace dump
ACPICA: Object repair code: Support to add Package wrappers
ACPICA: Update to version 20120320
Boris Ostrovsky (2):
idle, x86: Allow off-lined CPU to enter deeper C states
cpuidle: power_usage should be declared signed integer
Chen Gong (3):
ACPI, APEI, EINJ, limit the range of einj_param
ACPI, APEI, EINJ, new parameter to control trigger action
Update documentation for parameter *notrigger* in einj.txt
Corentin Chary (1):
ACPI / Video: blacklist some samsung laptops
Dan Carpenter (2):
thermal: spear13xx: checking for NULL instead of IS_ERR()
ACPI throttling: fix endian bug in acpi_read_throttling_status()
Daniel Lezcano (3):
cpuidle: use the driver's state_count as default
cpuidle: remove useless array definition in cpuidle_structure
cpuidle: remove unused 'governor_data' field
Fabio Estevam (1):
drivers/thermal/thermal_sys.c: fix build warning
Gary Hade (1):
ACPI, APEI: Fix incorrect APEI register bit width check and usage
Jan Beulich (1):
ACPI: consistently use should_use_kmap()
Jiang Liu (2):
ACPI, APEI, Fix ERST header length check
CPER failed to handle generic error records with multiple sections
Joe Perches (4):
thermal_sys: remove unnecessary line continuations
thermal_sys: remove obfuscating used-once macros
thermal_sys: kernel style cleanups
thermal_sys: convert printks to pr_<level>
Julia Lawall (1):
ACPI: processor_driver: add missing kfree
Julian Anastasov (1):
ACPICA: Fix regression in FADT revision checks
Konrad Rzeszutek Wilk (1):
tboot: Add return values for tboot_sleep
Len Brown (11):
ACPI: ignore FADT reset-reg-sup flag
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/.../konrad/xen into tboot
tools turbostat: add summary option
tools turbostat: reduce measurement overhead due to IPIs
tools turbostat: harden against cpu online/offline
Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'thermal', 'turbostat' and 'video' into release
Merge branch 'apei' into release
Merge branch 'red-hat-bz-727865' into release
Merge branch 'd3' into release
Merge branch 'tboot' into release
Merge branch 'upstream' into release
Lin Ming (4):
ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS
ACPI: Move module parameter gts and bfs to sleep.c
ACPI: Add interface to register/unregister device to/from power resources
ACPI, PCI: Move acpi_dev_run_wake() to ACPI core
Matthew Garrett (4):
ACPI: Evaluate thermal trip points before reading temperature
ACPI: Ensure thermal limits match CPU frequencies
ACPI: export acpi_kobj
ACPI: Add support for exposing BGRT data
Myron Stowe (1):
ACPI: Fix logic for removing mappings in 'acpi_unmap'
Paul E. McKenney (1):
ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
Petr Vandrovec (1):
ACPI: Fix use-after-free in acpi_map_lsapic
Robert Lee (9):
cpuidle: Add common time keeping and irq enabling
ARM: at91: Consolidate time keeping and irq enable
ARM: kirkwood: Consolidate time keeping and irq enable
ARM: davinci: Consolidate time keeping and irq enable
ARM: omap: Consolidate OMAP3 time keeping and irq enable
ARM: omap: Consolidate OMAP4 time keeping and irq enable
ARM: shmobile: Consolidate time keeping and irq enable
SH: shmobile: Consolidate time keeping and irq enable
ARM: davinci: Fix for cpuidle consolidation changes
ShuoX Liu (1):
cpuidle: add a sysfs entry to disable specific C state for debug purpose.
Tang Liang (1):
x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
Toshi Kani (1):
ACPI: Add CPU hotplug support for processor device objects
Vincenzo Frascino (1):
thermal: add support for thermal sensor present on SPEAr13xx machines
Viresh Kumar (1):
thermal/spear_thermal: replace readl/writel with lighter _relaxed variants
Yinghai Lu (1):
PNPACPI: Fix device ref leaking in acpi_pnp_match
Zhang Rui (1):
ACPI: Introduce ACPI D3_COLD state support
Documentation/ABI/testing/sysfs-firmware-acpi | 20 +
Documentation/acpi/apei/einj.txt | 8 +
Documentation/cpuidle/sysfs.txt | 5 +
arch/arm/include/asm/cpuidle.h | 29 ++
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/cpuidle.c | 21 ++
arch/arm/mach-at91/cpuidle.c | 63 ++--
arch/arm/mach-davinci/cpuidle.c | 83 ++--
arch/arm/mach-kirkwood/cpuidle.c | 72 ++--
arch/arm/mach-omap2/cpuidle34xx.c | 42 +--
arch/arm/mach-omap2/cpuidle44xx.c | 21 +-
arch/arm/mach-shmobile/cpuidle.c | 31 +-
arch/sh/kernel/cpu/shmobile/cpuidle.c | 10 +-
arch/x86/kernel/acpi/boot.c | 3 +-
arch/x86/kernel/smpboot.c | 4 +-
arch/x86/kernel/tboot.c | 9 +-
drivers/acpi/Kconfig | 9 +
drivers/acpi/Makefile | 1 +
drivers/acpi/acpica/Makefile | 4 +-
drivers/acpi/acpica/accommon.h | 1 -
drivers/acpi/acpica/acdebug.h | 8 +-
drivers/acpi/acpica/acevents.h | 21 +-
drivers/acpi/acpica/acglobal.h | 11 +-
drivers/acpi/acpica/achware.h | 32 +-
drivers/acpi/acpica/aclocal.h | 1 +
drivers/acpi/acpica/acmacros.h | 6 +
drivers/acpi/acpica/acnamesp.h | 5 +-
drivers/acpi/acpica/actables.h | 5 +
drivers/acpi/acpica/evevent.c | 4 +-
drivers/acpi/acpica/evglock.c | 4 +-
drivers/acpi/acpica/evgpe.c | 4 +-
drivers/acpi/acpica/evgpeblk.c | 4 +-
drivers/acpi/acpica/evgpeinit.c | 4 +-
drivers/acpi/acpica/evgpeutil.c | 3 +
drivers/acpi/acpica/evmisc.c | 26 +-
drivers/acpi/acpica/evsci.c | 4 +-
drivers/acpi/acpica/evxface.c | 436 +++++++++++-----------
drivers/acpi/acpica/evxfevnt.c | 2 +
drivers/acpi/acpica/evxfgpe.c | 2 +
drivers/acpi/acpica/hwacpi.c | 3 +
drivers/acpi/acpica/hwesleep.c | 247 ++++++++++++
drivers/acpi/acpica/hwgpe.c | 4 +-
drivers/acpi/acpica/hwregs.c | 16 +-
drivers/acpi/acpica/hwsleep.c | 401 ++++----------------
drivers/acpi/acpica/hwtimer.c | 2 +
drivers/acpi/acpica/hwxface.c | 50 +--
drivers/acpi/acpica/hwxfsleep.c | 431 +++++++++++++++++++++
drivers/acpi/acpica/nsdump.c | 15 +-
drivers/acpi/acpica/nsdumpdv.c | 2 +-
drivers/acpi/acpica/nspredef.c | 4 +-
drivers/acpi/acpica/nsrepair.c | 159 +++-----
drivers/acpi/acpica/nsutils.c | 2 +-
drivers/acpi/acpica/tbfadt.c | 8 +-
drivers/acpi/acpica/tbinstal.c | 117 +++++-
drivers/acpi/acpica/tbutils.c | 95 ++---
drivers/acpi/acpica/utdecode.c | 34 +-
drivers/acpi/acpica/utglobal.c | 9 +-
drivers/acpi/acpica/utinit.c | 37 +-
drivers/acpi/acpica/utxface.c | 6 +-
drivers/acpi/apei/apei-base.c | 61 +--
drivers/acpi/apei/cper.c | 2 +
drivers/acpi/apei/einj.c | 17 +-
drivers/acpi/apei/erst.c | 2 +-
drivers/acpi/bgrt.c | 175 +++++++++
drivers/acpi/bus.c | 1 +
drivers/acpi/ec.c | 8 +-
drivers/acpi/nvs.c | 4 +-
drivers/acpi/osl.c | 124 ++----
drivers/acpi/power.c | 166 +++++++-
drivers/acpi/processor_driver.c | 62 ++-
drivers/acpi/processor_idle.c | 34 +-
drivers/acpi/processor_thermal.c | 45 ++-
drivers/acpi/processor_throttling.c | 5 +-
drivers/acpi/reboot.c | 3 +-
drivers/acpi/scan.c | 12 +-
drivers/acpi/sleep.c | 76 +++-
drivers/acpi/thermal.c | 8 +-
drivers/acpi/video_detect.c | 49 +++
drivers/cpuidle/cpuidle.c | 97 ++++-
drivers/cpuidle/driver.c | 2 +-
drivers/cpuidle/governors/menu.c | 7 +-
drivers/cpuidle/sysfs.c | 40 ++
drivers/pci/pci-acpi.c | 40 +-
drivers/platform/x86/intel_ips.c | 13 +-
drivers/pnp/pnpacpi/core.c | 7 +-
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/spear_thermal.c | 206 ++++++++++
drivers/thermal/thermal_sys.c | 94 ++---
{drivers/acpi/acpica => include/acpi}/acconfig.h | 19 +-
include/acpi/acexcep.h | 7 +-
include/acpi/acnames.h | 12 +-
include/acpi/acpi_bus.h | 7 +
include/acpi/acpiosxf.h | 13 +-
include/acpi/acpixf.h | 229 ++++++++----
include/acpi/actbl.h | 7 +
include/acpi/actypes.h | 22 +-
include/linux/acpi.h | 10 +
include/linux/cpuidle.h | 22 +-
include/linux/platform_data/spear_thermal.h | 26 ++
include/linux/tboot.h | 1 -
tools/power/x86/turbostat/turbostat.8 | 99 +++--
tools/power/x86/turbostat/turbostat.c | 245 ++++++++----
103 files changed, 3205 insertions(+), 1545 deletions(-)
create mode 100644 arch/arm/include/asm/cpuidle.h
create mode 100644 arch/arm/kernel/cpuidle.c
create mode 100644 drivers/acpi/acpica/hwesleep.c
create mode 100644 drivers/acpi/acpica/hwxfsleep.c
create mode 100644 drivers/acpi/bgrt.c
create mode 100644 drivers/thermal/spear_thermal.c
rename {drivers/acpi/acpica => include/acpi}/acconfig.h (92%)
create mode 100644 include/linux/platform_data/spear_thermal.h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge
2012-03-30 11:38 [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge Len Brown
@ 2012-03-30 16:48 ` Rob Lee
2012-03-30 19:16 ` Linus Torvalds
1 sibling, 0 replies; 7+ messages in thread
From: Rob Lee @ 2012-03-30 16:48 UTC (permalink / raw)
To: Len Brown
Cc: Linus Torvalds, Daniel Lezcano, linux-acpi, Linux PM list,
linux-kernel, Nicolas Ferre
Hello Len,
On Fri, Mar 30, 2012 at 6:38 AM, Len Brown <lenb@kernel.org> wrote:
> Hi Linus,
>
> Please pull these ACPI & Power Management patches.
>
> ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup
> cpuidle evolving, more ARM use
> thermal sub-system evolving, ditto
> assorted other PM bits
>
> The top commit is a merge with your latest tree
> to address some cpuidle/ARM conflicts.
>
> Rob, Daniel,
>
> As you both modified at91_enter_idle(), and I don't know the semantics
> of at91_standby(), I had to guess at the correct merge.
> Please double check it and correct as necessary.
See this link which I believe is the same conflict on linux-next and
Stephen's resolution is verified by me, Daniel, and Nicolas Ferre.
https://lkml.org/lkml/2012/3/9/47
Thanks,
Rob
>
> thanks!
> Len Brown, Intel Open Source Technology Center
>
> The following changes since commit f52b69f86e27903d6896ed5fa7cd280fec8de532:
>
> Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (2012-03-30 00:09:17 -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 14b5e206d755327ca176920ce2984c55191bbe1d:
>
> Merge branch 'upstream' into release (2012-03-30 07:00:19 -0400)
>
> ----------------------------------------------------------------
>
> Alex He (1):
> ACPI: Clean redundant codes in scan.c
>
> Amit Daniel Kachhap (1):
> thermal: Fix for setting the thermal zone mode to enable/disable
>
> Andi Kleen (3):
> ACPI: ec: Do request_region outside WARN()
> ACPI: Make ACPI interrupt threaded
> Disable MCP limit exceeded messages from Intel IPS driver
>
> Bjorn Helgaas (1):
> ACPI / PM: print physical addresses consistently with other parts of kernel
>
> Bob Moore (16):
> ACPICA: Update _REV return value to 5
> ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers
> ACPICA: Move ACPI timer prototypes to public acpixf file
> ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware
> ACPICA: Expand OSL memory read/write interfaces to 64 bits
> ACPICA: ACPI 5: Update debug output for new notify values
> ACPICA: Add acpi_os_physical_table_override interface
> ACPICA: Distill multiple sleep method functions to a single function
> ACPICA: Split sleep/wake functions into two files
> ACPICA: Add table-driven dispatch for sleep/wake functions
> ACPICA: Update to version 20120215
> ACPICA: Clarify METHOD_NAME* defines for full-pathname cases
> ACPICA: Change exception code for invalid pathname in acpi_evaluate_object
> ACPICA: Debugger: Add missing object info to namespace dump
> ACPICA: Object repair code: Support to add Package wrappers
> ACPICA: Update to version 20120320
>
> Boris Ostrovsky (2):
> idle, x86: Allow off-lined CPU to enter deeper C states
> cpuidle: power_usage should be declared signed integer
>
> Chen Gong (3):
> ACPI, APEI, EINJ, limit the range of einj_param
> ACPI, APEI, EINJ, new parameter to control trigger action
> Update documentation for parameter *notrigger* in einj.txt
>
> Corentin Chary (1):
> ACPI / Video: blacklist some samsung laptops
>
> Dan Carpenter (2):
> thermal: spear13xx: checking for NULL instead of IS_ERR()
> ACPI throttling: fix endian bug in acpi_read_throttling_status()
>
> Daniel Lezcano (3):
> cpuidle: use the driver's state_count as default
> cpuidle: remove useless array definition in cpuidle_structure
> cpuidle: remove unused 'governor_data' field
>
> Fabio Estevam (1):
> drivers/thermal/thermal_sys.c: fix build warning
>
> Gary Hade (1):
> ACPI, APEI: Fix incorrect APEI register bit width check and usage
>
> Jan Beulich (1):
> ACPI: consistently use should_use_kmap()
>
> Jiang Liu (2):
> ACPI, APEI, Fix ERST header length check
> CPER failed to handle generic error records with multiple sections
>
> Joe Perches (4):
> thermal_sys: remove unnecessary line continuations
> thermal_sys: remove obfuscating used-once macros
> thermal_sys: kernel style cleanups
> thermal_sys: convert printks to pr_<level>
>
> Julia Lawall (1):
> ACPI: processor_driver: add missing kfree
>
> Julian Anastasov (1):
> ACPICA: Fix regression in FADT revision checks
>
> Konrad Rzeszutek Wilk (1):
> tboot: Add return values for tboot_sleep
>
> Len Brown (11):
> ACPI: ignore FADT reset-reg-sup flag
> Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/.../konrad/xen into tboot
> tools turbostat: add summary option
> tools turbostat: reduce measurement overhead due to IPIs
> tools turbostat: harden against cpu online/offline
> Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'thermal', 'turbostat' and 'video' into release
> Merge branch 'apei' into release
> Merge branch 'red-hat-bz-727865' into release
> Merge branch 'd3' into release
> Merge branch 'tboot' into release
> Merge branch 'upstream' into release
>
> Lin Ming (4):
> ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS
> ACPI: Move module parameter gts and bfs to sleep.c
> ACPI: Add interface to register/unregister device to/from power resources
> ACPI, PCI: Move acpi_dev_run_wake() to ACPI core
>
> Matthew Garrett (4):
> ACPI: Evaluate thermal trip points before reading temperature
> ACPI: Ensure thermal limits match CPU frequencies
> ACPI: export acpi_kobj
> ACPI: Add support for exposing BGRT data
>
> Myron Stowe (1):
> ACPI: Fix logic for removing mappings in 'acpi_unmap'
>
> Paul E. McKenney (1):
> ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
>
> Petr Vandrovec (1):
> ACPI: Fix use-after-free in acpi_map_lsapic
>
> Robert Lee (9):
> cpuidle: Add common time keeping and irq enabling
> ARM: at91: Consolidate time keeping and irq enable
> ARM: kirkwood: Consolidate time keeping and irq enable
> ARM: davinci: Consolidate time keeping and irq enable
> ARM: omap: Consolidate OMAP3 time keeping and irq enable
> ARM: omap: Consolidate OMAP4 time keeping and irq enable
> ARM: shmobile: Consolidate time keeping and irq enable
> SH: shmobile: Consolidate time keeping and irq enable
> ARM: davinci: Fix for cpuidle consolidation changes
>
> ShuoX Liu (1):
> cpuidle: add a sysfs entry to disable specific C state for debug purpose.
>
> Tang Liang (1):
> x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
>
> Toshi Kani (1):
> ACPI: Add CPU hotplug support for processor device objects
>
> Vincenzo Frascino (1):
> thermal: add support for thermal sensor present on SPEAr13xx machines
>
> Viresh Kumar (1):
> thermal/spear_thermal: replace readl/writel with lighter _relaxed variants
>
> Yinghai Lu (1):
> PNPACPI: Fix device ref leaking in acpi_pnp_match
>
> Zhang Rui (1):
> ACPI: Introduce ACPI D3_COLD state support
>
> Documentation/ABI/testing/sysfs-firmware-acpi | 20 +
> Documentation/acpi/apei/einj.txt | 8 +
> Documentation/cpuidle/sysfs.txt | 5 +
> arch/arm/include/asm/cpuidle.h | 29 ++
> arch/arm/kernel/Makefile | 2 +-
> arch/arm/kernel/cpuidle.c | 21 ++
> arch/arm/mach-at91/cpuidle.c | 63 ++--
> arch/arm/mach-davinci/cpuidle.c | 83 ++--
> arch/arm/mach-kirkwood/cpuidle.c | 72 ++--
> arch/arm/mach-omap2/cpuidle34xx.c | 42 +--
> arch/arm/mach-omap2/cpuidle44xx.c | 21 +-
> arch/arm/mach-shmobile/cpuidle.c | 31 +-
> arch/sh/kernel/cpu/shmobile/cpuidle.c | 10 +-
> arch/x86/kernel/acpi/boot.c | 3 +-
> arch/x86/kernel/smpboot.c | 4 +-
> arch/x86/kernel/tboot.c | 9 +-
> drivers/acpi/Kconfig | 9 +
> drivers/acpi/Makefile | 1 +
> drivers/acpi/acpica/Makefile | 4 +-
> drivers/acpi/acpica/accommon.h | 1 -
> drivers/acpi/acpica/acdebug.h | 8 +-
> drivers/acpi/acpica/acevents.h | 21 +-
> drivers/acpi/acpica/acglobal.h | 11 +-
> drivers/acpi/acpica/achware.h | 32 +-
> drivers/acpi/acpica/aclocal.h | 1 +
> drivers/acpi/acpica/acmacros.h | 6 +
> drivers/acpi/acpica/acnamesp.h | 5 +-
> drivers/acpi/acpica/actables.h | 5 +
> drivers/acpi/acpica/evevent.c | 4 +-
> drivers/acpi/acpica/evglock.c | 4 +-
> drivers/acpi/acpica/evgpe.c | 4 +-
> drivers/acpi/acpica/evgpeblk.c | 4 +-
> drivers/acpi/acpica/evgpeinit.c | 4 +-
> drivers/acpi/acpica/evgpeutil.c | 3 +
> drivers/acpi/acpica/evmisc.c | 26 +-
> drivers/acpi/acpica/evsci.c | 4 +-
> drivers/acpi/acpica/evxface.c | 436 +++++++++++-----------
> drivers/acpi/acpica/evxfevnt.c | 2 +
> drivers/acpi/acpica/evxfgpe.c | 2 +
> drivers/acpi/acpica/hwacpi.c | 3 +
> drivers/acpi/acpica/hwesleep.c | 247 ++++++++++++
> drivers/acpi/acpica/hwgpe.c | 4 +-
> drivers/acpi/acpica/hwregs.c | 16 +-
> drivers/acpi/acpica/hwsleep.c | 401 ++++----------------
> drivers/acpi/acpica/hwtimer.c | 2 +
> drivers/acpi/acpica/hwxface.c | 50 +--
> drivers/acpi/acpica/hwxfsleep.c | 431 +++++++++++++++++++++
> drivers/acpi/acpica/nsdump.c | 15 +-
> drivers/acpi/acpica/nsdumpdv.c | 2 +-
> drivers/acpi/acpica/nspredef.c | 4 +-
> drivers/acpi/acpica/nsrepair.c | 159 +++-----
> drivers/acpi/acpica/nsutils.c | 2 +-
> drivers/acpi/acpica/tbfadt.c | 8 +-
> drivers/acpi/acpica/tbinstal.c | 117 +++++-
> drivers/acpi/acpica/tbutils.c | 95 ++---
> drivers/acpi/acpica/utdecode.c | 34 +-
> drivers/acpi/acpica/utglobal.c | 9 +-
> drivers/acpi/acpica/utinit.c | 37 +-
> drivers/acpi/acpica/utxface.c | 6 +-
> drivers/acpi/apei/apei-base.c | 61 +--
> drivers/acpi/apei/cper.c | 2 +
> drivers/acpi/apei/einj.c | 17 +-
> drivers/acpi/apei/erst.c | 2 +-
> drivers/acpi/bgrt.c | 175 +++++++++
> drivers/acpi/bus.c | 1 +
> drivers/acpi/ec.c | 8 +-
> drivers/acpi/nvs.c | 4 +-
> drivers/acpi/osl.c | 124 ++----
> drivers/acpi/power.c | 166 +++++++-
> drivers/acpi/processor_driver.c | 62 ++-
> drivers/acpi/processor_idle.c | 34 +-
> drivers/acpi/processor_thermal.c | 45 ++-
> drivers/acpi/processor_throttling.c | 5 +-
> drivers/acpi/reboot.c | 3 +-
> drivers/acpi/scan.c | 12 +-
> drivers/acpi/sleep.c | 76 +++-
> drivers/acpi/thermal.c | 8 +-
> drivers/acpi/video_detect.c | 49 +++
> drivers/cpuidle/cpuidle.c | 97 ++++-
> drivers/cpuidle/driver.c | 2 +-
> drivers/cpuidle/governors/menu.c | 7 +-
> drivers/cpuidle/sysfs.c | 40 ++
> drivers/pci/pci-acpi.c | 40 +-
> drivers/platform/x86/intel_ips.c | 13 +-
> drivers/pnp/pnpacpi/core.c | 7 +-
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/spear_thermal.c | 206 ++++++++++
> drivers/thermal/thermal_sys.c | 94 ++---
> {drivers/acpi/acpica => include/acpi}/acconfig.h | 19 +-
> include/acpi/acexcep.h | 7 +-
> include/acpi/acnames.h | 12 +-
> include/acpi/acpi_bus.h | 7 +
> include/acpi/acpiosxf.h | 13 +-
> include/acpi/acpixf.h | 229 ++++++++----
> include/acpi/actbl.h | 7 +
> include/acpi/actypes.h | 22 +-
> include/linux/acpi.h | 10 +
> include/linux/cpuidle.h | 22 +-
> include/linux/platform_data/spear_thermal.h | 26 ++
> include/linux/tboot.h | 1 -
> tools/power/x86/turbostat/turbostat.8 | 99 +++--
> tools/power/x86/turbostat/turbostat.c | 245 ++++++++----
> 103 files changed, 3205 insertions(+), 1545 deletions(-)
> create mode 100644 arch/arm/include/asm/cpuidle.h
> create mode 100644 arch/arm/kernel/cpuidle.c
> create mode 100644 drivers/acpi/acpica/hwesleep.c
> create mode 100644 drivers/acpi/acpica/hwxfsleep.c
> create mode 100644 drivers/acpi/bgrt.c
> create mode 100644 drivers/thermal/spear_thermal.c
> rename {drivers/acpi/acpica => include/acpi}/acconfig.h (92%)
> create mode 100644 include/linux/platform_data/spear_thermal.h
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge
@ 2012-03-30 16:48 ` Rob Lee
0 siblings, 0 replies; 7+ messages in thread
From: Rob Lee @ 2012-03-30 16:48 UTC (permalink / raw)
To: Len Brown
Cc: Linus Torvalds, Daniel Lezcano, linux-acpi, Linux PM list,
linux-kernel, Nicolas Ferre
Hello Len,
On Fri, Mar 30, 2012 at 6:38 AM, Len Brown <lenb@kernel.org> wrote:
> Hi Linus,
>
> Please pull these ACPI & Power Management patches.
>
> ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup
> cpuidle evolving, more ARM use
> thermal sub-system evolving, ditto
> assorted other PM bits
>
> The top commit is a merge with your latest tree
> to address some cpuidle/ARM conflicts.
>
> Rob, Daniel,
>
> As you both modified at91_enter_idle(), and I don't know the semantics
> of at91_standby(), I had to guess at the correct merge.
> Please double check it and correct as necessary.
See this link which I believe is the same conflict on linux-next and
Stephen's resolution is verified by me, Daniel, and Nicolas Ferre.
https://lkml.org/lkml/2012/3/9/47
Thanks,
Rob
>
> thanks!
> Len Brown, Intel Open Source Technology Center
>
> The following changes since commit f52b69f86e27903d6896ed5fa7cd280fec8de532:
>
> Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (2012-03-30 00:09:17 -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 14b5e206d755327ca176920ce2984c55191bbe1d:
>
> Merge branch 'upstream' into release (2012-03-30 07:00:19 -0400)
>
> ----------------------------------------------------------------
>
> Alex He (1):
> ACPI: Clean redundant codes in scan.c
>
> Amit Daniel Kachhap (1):
> thermal: Fix for setting the thermal zone mode to enable/disable
>
> Andi Kleen (3):
> ACPI: ec: Do request_region outside WARN()
> ACPI: Make ACPI interrupt threaded
> Disable MCP limit exceeded messages from Intel IPS driver
>
> Bjorn Helgaas (1):
> ACPI / PM: print physical addresses consistently with other parts of kernel
>
> Bob Moore (16):
> ACPICA: Update _REV return value to 5
> ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers
> ACPICA: Move ACPI timer prototypes to public acpixf file
> ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware
> ACPICA: Expand OSL memory read/write interfaces to 64 bits
> ACPICA: ACPI 5: Update debug output for new notify values
> ACPICA: Add acpi_os_physical_table_override interface
> ACPICA: Distill multiple sleep method functions to a single function
> ACPICA: Split sleep/wake functions into two files
> ACPICA: Add table-driven dispatch for sleep/wake functions
> ACPICA: Update to version 20120215
> ACPICA: Clarify METHOD_NAME* defines for full-pathname cases
> ACPICA: Change exception code for invalid pathname in acpi_evaluate_object
> ACPICA: Debugger: Add missing object info to namespace dump
> ACPICA: Object repair code: Support to add Package wrappers
> ACPICA: Update to version 20120320
>
> Boris Ostrovsky (2):
> idle, x86: Allow off-lined CPU to enter deeper C states
> cpuidle: power_usage should be declared signed integer
>
> Chen Gong (3):
> ACPI, APEI, EINJ, limit the range of einj_param
> ACPI, APEI, EINJ, new parameter to control trigger action
> Update documentation for parameter *notrigger* in einj.txt
>
> Corentin Chary (1):
> ACPI / Video: blacklist some samsung laptops
>
> Dan Carpenter (2):
> thermal: spear13xx: checking for NULL instead of IS_ERR()
> ACPI throttling: fix endian bug in acpi_read_throttling_status()
>
> Daniel Lezcano (3):
> cpuidle: use the driver's state_count as default
> cpuidle: remove useless array definition in cpuidle_structure
> cpuidle: remove unused 'governor_data' field
>
> Fabio Estevam (1):
> drivers/thermal/thermal_sys.c: fix build warning
>
> Gary Hade (1):
> ACPI, APEI: Fix incorrect APEI register bit width check and usage
>
> Jan Beulich (1):
> ACPI: consistently use should_use_kmap()
>
> Jiang Liu (2):
> ACPI, APEI, Fix ERST header length check
> CPER failed to handle generic error records with multiple sections
>
> Joe Perches (4):
> thermal_sys: remove unnecessary line continuations
> thermal_sys: remove obfuscating used-once macros
> thermal_sys: kernel style cleanups
> thermal_sys: convert printks to pr_<level>
>
> Julia Lawall (1):
> ACPI: processor_driver: add missing kfree
>
> Julian Anastasov (1):
> ACPICA: Fix regression in FADT revision checks
>
> Konrad Rzeszutek Wilk (1):
> tboot: Add return values for tboot_sleep
>
> Len Brown (11):
> ACPI: ignore FADT reset-reg-sup flag
> Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/.../konrad/xen into tboot
> tools turbostat: add summary option
> tools turbostat: reduce measurement overhead due to IPIs
> tools turbostat: harden against cpu online/offline
> Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'thermal', 'turbostat' and 'video' into release
> Merge branch 'apei' into release
> Merge branch 'red-hat-bz-727865' into release
> Merge branch 'd3' into release
> Merge branch 'tboot' into release
> Merge branch 'upstream' into release
>
> Lin Ming (4):
> ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS
> ACPI: Move module parameter gts and bfs to sleep.c
> ACPI: Add interface to register/unregister device to/from power resources
> ACPI, PCI: Move acpi_dev_run_wake() to ACPI core
>
> Matthew Garrett (4):
> ACPI: Evaluate thermal trip points before reading temperature
> ACPI: Ensure thermal limits match CPU frequencies
> ACPI: export acpi_kobj
> ACPI: Add support for exposing BGRT data
>
> Myron Stowe (1):
> ACPI: Fix logic for removing mappings in 'acpi_unmap'
>
> Paul E. McKenney (1):
> ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
>
> Petr Vandrovec (1):
> ACPI: Fix use-after-free in acpi_map_lsapic
>
> Robert Lee (9):
> cpuidle: Add common time keeping and irq enabling
> ARM: at91: Consolidate time keeping and irq enable
> ARM: kirkwood: Consolidate time keeping and irq enable
> ARM: davinci: Consolidate time keeping and irq enable
> ARM: omap: Consolidate OMAP3 time keeping and irq enable
> ARM: omap: Consolidate OMAP4 time keeping and irq enable
> ARM: shmobile: Consolidate time keeping and irq enable
> SH: shmobile: Consolidate time keeping and irq enable
> ARM: davinci: Fix for cpuidle consolidation changes
>
> ShuoX Liu (1):
> cpuidle: add a sysfs entry to disable specific C state for debug purpose.
>
> Tang Liang (1):
> x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
>
> Toshi Kani (1):
> ACPI: Add CPU hotplug support for processor device objects
>
> Vincenzo Frascino (1):
> thermal: add support for thermal sensor present on SPEAr13xx machines
>
> Viresh Kumar (1):
> thermal/spear_thermal: replace readl/writel with lighter _relaxed variants
>
> Yinghai Lu (1):
> PNPACPI: Fix device ref leaking in acpi_pnp_match
>
> Zhang Rui (1):
> ACPI: Introduce ACPI D3_COLD state support
>
> Documentation/ABI/testing/sysfs-firmware-acpi | 20 +
> Documentation/acpi/apei/einj.txt | 8 +
> Documentation/cpuidle/sysfs.txt | 5 +
> arch/arm/include/asm/cpuidle.h | 29 ++
> arch/arm/kernel/Makefile | 2 +-
> arch/arm/kernel/cpuidle.c | 21 ++
> arch/arm/mach-at91/cpuidle.c | 63 ++--
> arch/arm/mach-davinci/cpuidle.c | 83 ++--
> arch/arm/mach-kirkwood/cpuidle.c | 72 ++--
> arch/arm/mach-omap2/cpuidle34xx.c | 42 +--
> arch/arm/mach-omap2/cpuidle44xx.c | 21 +-
> arch/arm/mach-shmobile/cpuidle.c | 31 +-
> arch/sh/kernel/cpu/shmobile/cpuidle.c | 10 +-
> arch/x86/kernel/acpi/boot.c | 3 +-
> arch/x86/kernel/smpboot.c | 4 +-
> arch/x86/kernel/tboot.c | 9 +-
> drivers/acpi/Kconfig | 9 +
> drivers/acpi/Makefile | 1 +
> drivers/acpi/acpica/Makefile | 4 +-
> drivers/acpi/acpica/accommon.h | 1 -
> drivers/acpi/acpica/acdebug.h | 8 +-
> drivers/acpi/acpica/acevents.h | 21 +-
> drivers/acpi/acpica/acglobal.h | 11 +-
> drivers/acpi/acpica/achware.h | 32 +-
> drivers/acpi/acpica/aclocal.h | 1 +
> drivers/acpi/acpica/acmacros.h | 6 +
> drivers/acpi/acpica/acnamesp.h | 5 +-
> drivers/acpi/acpica/actables.h | 5 +
> drivers/acpi/acpica/evevent.c | 4 +-
> drivers/acpi/acpica/evglock.c | 4 +-
> drivers/acpi/acpica/evgpe.c | 4 +-
> drivers/acpi/acpica/evgpeblk.c | 4 +-
> drivers/acpi/acpica/evgpeinit.c | 4 +-
> drivers/acpi/acpica/evgpeutil.c | 3 +
> drivers/acpi/acpica/evmisc.c | 26 +-
> drivers/acpi/acpica/evsci.c | 4 +-
> drivers/acpi/acpica/evxface.c | 436 +++++++++++-----------
> drivers/acpi/acpica/evxfevnt.c | 2 +
> drivers/acpi/acpica/evxfgpe.c | 2 +
> drivers/acpi/acpica/hwacpi.c | 3 +
> drivers/acpi/acpica/hwesleep.c | 247 ++++++++++++
> drivers/acpi/acpica/hwgpe.c | 4 +-
> drivers/acpi/acpica/hwregs.c | 16 +-
> drivers/acpi/acpica/hwsleep.c | 401 ++++----------------
> drivers/acpi/acpica/hwtimer.c | 2 +
> drivers/acpi/acpica/hwxface.c | 50 +--
> drivers/acpi/acpica/hwxfsleep.c | 431 +++++++++++++++++++++
> drivers/acpi/acpica/nsdump.c | 15 +-
> drivers/acpi/acpica/nsdumpdv.c | 2 +-
> drivers/acpi/acpica/nspredef.c | 4 +-
> drivers/acpi/acpica/nsrepair.c | 159 +++-----
> drivers/acpi/acpica/nsutils.c | 2 +-
> drivers/acpi/acpica/tbfadt.c | 8 +-
> drivers/acpi/acpica/tbinstal.c | 117 +++++-
> drivers/acpi/acpica/tbutils.c | 95 ++---
> drivers/acpi/acpica/utdecode.c | 34 +-
> drivers/acpi/acpica/utglobal.c | 9 +-
> drivers/acpi/acpica/utinit.c | 37 +-
> drivers/acpi/acpica/utxface.c | 6 +-
> drivers/acpi/apei/apei-base.c | 61 +--
> drivers/acpi/apei/cper.c | 2 +
> drivers/acpi/apei/einj.c | 17 +-
> drivers/acpi/apei/erst.c | 2 +-
> drivers/acpi/bgrt.c | 175 +++++++++
> drivers/acpi/bus.c | 1 +
> drivers/acpi/ec.c | 8 +-
> drivers/acpi/nvs.c | 4 +-
> drivers/acpi/osl.c | 124 ++----
> drivers/acpi/power.c | 166 +++++++-
> drivers/acpi/processor_driver.c | 62 ++-
> drivers/acpi/processor_idle.c | 34 +-
> drivers/acpi/processor_thermal.c | 45 ++-
> drivers/acpi/processor_throttling.c | 5 +-
> drivers/acpi/reboot.c | 3 +-
> drivers/acpi/scan.c | 12 +-
> drivers/acpi/sleep.c | 76 +++-
> drivers/acpi/thermal.c | 8 +-
> drivers/acpi/video_detect.c | 49 +++
> drivers/cpuidle/cpuidle.c | 97 ++++-
> drivers/cpuidle/driver.c | 2 +-
> drivers/cpuidle/governors/menu.c | 7 +-
> drivers/cpuidle/sysfs.c | 40 ++
> drivers/pci/pci-acpi.c | 40 +-
> drivers/platform/x86/intel_ips.c | 13 +-
> drivers/pnp/pnpacpi/core.c | 7 +-
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/spear_thermal.c | 206 ++++++++++
> drivers/thermal/thermal_sys.c | 94 ++---
> {drivers/acpi/acpica => include/acpi}/acconfig.h | 19 +-
> include/acpi/acexcep.h | 7 +-
> include/acpi/acnames.h | 12 +-
> include/acpi/acpi_bus.h | 7 +
> include/acpi/acpiosxf.h | 13 +-
> include/acpi/acpixf.h | 229 ++++++++----
> include/acpi/actbl.h | 7 +
> include/acpi/actypes.h | 22 +-
> include/linux/acpi.h | 10 +
> include/linux/cpuidle.h | 22 +-
> include/linux/platform_data/spear_thermal.h | 26 ++
> include/linux/tboot.h | 1 -
> tools/power/x86/turbostat/turbostat.8 | 99 +++--
> tools/power/x86/turbostat/turbostat.c | 245 ++++++++----
> 103 files changed, 3205 insertions(+), 1545 deletions(-)
> create mode 100644 arch/arm/include/asm/cpuidle.h
> create mode 100644 arch/arm/kernel/cpuidle.c
> create mode 100644 drivers/acpi/acpica/hwesleep.c
> create mode 100644 drivers/acpi/acpica/hwxfsleep.c
> create mode 100644 drivers/acpi/bgrt.c
> create mode 100644 drivers/thermal/spear_thermal.c
> rename {drivers/acpi/acpica => include/acpi}/acconfig.h (92%)
> create mode 100644 include/linux/platform_data/spear_thermal.h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge
2012-03-30 11:38 [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge Len Brown
2012-03-30 16:48 ` Rob Lee
@ 2012-03-30 19:16 ` Linus Torvalds
2012-03-30 19:32 ` Linus Torvalds
1 sibling, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2012-03-30 19:16 UTC (permalink / raw)
To: Len Brown
Cc: Daniel Lezcano, Robert Lee, linux-acpi, Linux PM list, linux-kernel
On Fri, Mar 30, 2012 at 4:38 AM, Len Brown <lenb@kernel.org> wrote:
>
> The top commit is a merge with your latest tree
> to address some cpuidle/ARM conflicts.
Len, *please* don't do this.
I really hate it when submaintainers do merges to resolve things to
make things "easier" for me, and they do them wrong.
And I *guarantee* that your merge resolution is wrong. It has
references to the sdram_selfrefresh_[en|dis]able() functions that
simply no longer exist. There's no way that can compile.
Besides, even if you had done the merge right, I simply want to know
about conflicts between different maintainers. As a top-level
maintainer, that's the kind of information I need to know.
Finally, people - your merge messages suck. Leaving the list of
conflicting files without talking about what the conflict actually was
is *not* a good merge message. Len, you're not the only one that does
this, but it is yet another reason why I absolutely detest some of the
merges I see: they are just very uninformative, and don't add anything
useful to the tree - quite the reverse. They hide a problem, without
actually talking about what the problem was.
Now, I'm not guaranteeing that I will always do any of the above three
things better. I can screw up my merges too. And sometimes I miss
non-context merge conflicts that the maintainer may have known about.
And yes, sometimes my merge messages suck too (although I've tried
very hard to become better at them).
But there's been at least three merges that submaintainers did for me
this merge window where I looked at their merge and said "No, that's
wrong, and I would have done it better". Two of those were the nice
kind of "I left it unmerged, but here's my example merge if you want
to take it", so the wrong merges didn't ever show up in the tree. But
yours is now no longer even the top commit in your pile of fixes, so
now I apparently have to take that *known*incorrect* merge and fix it
up with an evil merge of my own.
So once more: please NEVER EVER make my life "easier" by pre-merging
stuff. EVER.
Feel free to do your regular octopus-merges of your *own* branches
where you just tie your own work together and bundle it up in a nice
package. Those merges are beautiful, and makes me go "Ahh, Len did a
really nice job keeping all his bugzilla fixes in separate nice
branches, and then he packaged it nicely for me too". That's a *good*
merge.
But don't go "oops, my changes conflict with somebody elses changes,
so let's hide the conflicts under a rug, and send Linus the pre-merged
tree so that he can just do a 'git pull' without having to even know
about things". That really doesn't make it easier for me.
If you want to make my life easier, the way to do that is:
- have a nice readable history.
This is much easier for me for two reasons:
(a) it makes it much easier for me when I pull, and then look at
the end result, and I go "that all looks nice, this is a maintainer
that clearly has it all together". I feel all warm and fuzzy, and I do
not get the feeling that I pulled some crap tree. Trust me, that makes
me much more comfy about the pull.
(b) when I do end up having to fix up some conflict, good history
without crazy backmerges etc make things *soo* much easier to see what
went on in the two conflicting branches. There is a real reason I hate
back-merges and ugly history: it really does make things much less
obvious.
- You can have a *separate* branch that has your "suggested merge"
for me. Say "here's my 'release' branch with all my work, and this
'merged-for-linus' branch has my suggested merge".
If you do that, I actually tend to do the merge *twice*: first I do
it normally by hand, and then after I'm all done, I will actually
re-do it in a local 'test' branch with your suggested merge, and see
what the differences are. This is how I noticed that two of the
suggested merges in this merge window were incorrect.
This sounds like "more work" for me, but it really isn't. Sure, I'll
do two merges, but the second merge will presumably not have any
conflicts, and now I have something I can double-check with. So it's a
bit more typing, but it saves me a lot of worries, and I can verify my
merge (or I can look at the parts we differed on and think harder
about just those, and just assume that the things we agreed on were
likely all correct)
So to re-iterate: please don't merge other sub-maintainers' code.
That's my job, I'm actually pretty good at it, and even if I were to
be no better at it than you are, I'd still want to know about the
conflict.
Please.
Linus
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge
2012-03-30 19:16 ` Linus Torvalds
@ 2012-03-30 19:32 ` Linus Torvalds
2012-03-30 19:54 ` Len Brown
0 siblings, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2012-03-30 19:32 UTC (permalink / raw)
To: Len Brown
Cc: Daniel Lezcano, Robert Lee, linux-acpi, Linux PM list, linux-kernel
On Fri, Mar 30, 2012 at 12:16 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> But there's been at least three merges that submaintainers did for me
> this merge window where I looked at their merge and said "No, that's
> wrong, and I would have done it better". Two of those were the nice
> kind of "I left it unmerged, but here's my example merge if you want
> to take it", so the wrong merges didn't ever show up in the tree. But
> yours is now no longer even the top commit in your pile of fixes, so
> now I apparently have to take that *known*incorrect* merge and fix it
> up with an evil merge of my own.
Ugh. I'm undoing my merge rather than do that evil merge that fixes up yours.
So I have three choices:
(a) I can just re-do your merge, and lose the two commits you had on top of it
(b) I can create a new local branch with your pre-merged state, and
cherry-pick the two commits on top of that, and then merge that, and
then fake out the pull request.
(c) I can ask you to do that fix up (rebase those two commits on top
of the state before the broken merge), and then you can ask me to pull
again, without the merge - same as (b) really, but I don't have to
fake the pull request message when I create the merge.
I think I'll do (c), but then probably fall back on (a) if I don't
hear from you. (b) gets me the tree I want, but I don't like faking
pull requests - I've occasionally pulled less than requested (exactly
because I didn't like the top merge), but I try to avoid actually
adding modified commits on top.
Linus
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge
2012-03-30 19:32 ` Linus Torvalds
@ 2012-03-30 19:54 ` Len Brown
2012-03-30 21:31 ` [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge - take 2 Len Brown
0 siblings, 1 reply; 7+ messages in thread
From: Len Brown @ 2012-03-30 19:54 UTC (permalink / raw)
To: Linus Torvalds
Cc: Daniel Lezcano, Robert Lee, linux-acpi, Linux PM list, linux-kernel
I'll take curtain C:-)
Will send you a fresh merge request in about an hour.
Sorry for the trouble.
thanks,
-Len
On 03/30/2012 03:32 PM, Linus Torvalds wrote:
> On Fri, Mar 30, 2012 at 12:16 PM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
>>
>> But there's been at least three merges that submaintainers did for me
>> this merge window where I looked at their merge and said "No, that's
>> wrong, and I would have done it better". Two of those were the nice
>> kind of "I left it unmerged, but here's my example merge if you want
>> to take it", so the wrong merges didn't ever show up in the tree. But
>> yours is now no longer even the top commit in your pile of fixes, so
>> now I apparently have to take that *known*incorrect* merge and fix it
>> up with an evil merge of my own.
>
> Ugh. I'm undoing my merge rather than do that evil merge that fixes up yours.
>
> So I have three choices:
>
> (a) I can just re-do your merge, and lose the two commits you had on top of it
>
> (b) I can create a new local branch with your pre-merged state, and
> cherry-pick the two commits on top of that, and then merge that, and
> then fake out the pull request.
>
> (c) I can ask you to do that fix up (rebase those two commits on top
> of the state before the broken merge), and then you can ask me to pull
> again, without the merge - same as (b) really, but I don't have to
> fake the pull request message when I create the merge.
>
> I think I'll do (c), but then probably fall back on (a) if I don't
> hear from you. (b) gets me the tree I want, but I don't like faking
> pull requests - I've occasionally pulled less than requested (exactly
> because I didn't like the top merge), but I try to avoid actually
> adding modified commits on top.
>
> Linus
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge - take 2
2012-03-30 19:54 ` Len Brown
@ 2012-03-30 21:31 ` Len Brown
0 siblings, 0 replies; 7+ messages in thread
From: Len Brown @ 2012-03-30 21:31 UTC (permalink / raw)
To: Linus Torvalds
Cc: Daniel Lezcano, Robert Lee, linux-acpi, Linux PM list, linux-kernel
Hi Linus,
Please pull these ACPI & Power Management patches.
ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup
cpuidle evolving, more ARM use
thermal sub-system evolving, ditto
assorted other PM bits
I have re-merged my tree, adding better comments on the conflict merges.
(and getting rid of those reverts that I had piled on top)
thanks!
Len Brown, Intel Open Source Technology Center
----------------------------------------------------------------
The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7:
Linux 3.3 (2012-03-18 16:15:34 -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 d326f44e5f2204c7a24db69bfc6dd3fe5f86182b:
Merge branch 'tboot' into release (2012-03-30 16:38:59 -0400)
----------------------------------------------------------------
I've also prepared a "merged-for-linus" branch for your reference
with a detailed merge commit comment. I hope you find it helpful.
The following changes since commit 9613bebb223dea3179c265dc31e1bb41ae39f321:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (2012-03-30 12:44:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git merged-for-linus
for you to fetch changes up to 2ed24901cd2ab3114522f3bb9657bcbadabf69fe:
Merge branch 'upstream' into merged-for-linus (2012-03-30 17:06:17 -0400)
----------------------------------------------------------------
Alex He (1):
ACPI: Clean redundant codes in scan.c
Amit Daniel Kachhap (1):
thermal: Fix for setting the thermal zone mode to enable/disable
Andi Kleen (4):
ACPI: Do cpufreq clamping for throttling per package v2
ACPI: ec: Do request_region outside WARN()
ACPI: Make ACPI interrupt threaded
Disable MCP limit exceeded messages from Intel IPS driver
Bjorn Helgaas (1):
ACPI / PM: print physical addresses consistently with other parts of kernel
Bob Moore (16):
ACPICA: Update _REV return value to 5
ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers
ACPICA: Move ACPI timer prototypes to public acpixf file
ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware
ACPICA: Expand OSL memory read/write interfaces to 64 bits
ACPICA: ACPI 5: Update debug output for new notify values
ACPICA: Add acpi_os_physical_table_override interface
ACPICA: Distill multiple sleep method functions to a single function
ACPICA: Split sleep/wake functions into two files
ACPICA: Add table-driven dispatch for sleep/wake functions
ACPICA: Update to version 20120215
ACPICA: Clarify METHOD_NAME* defines for full-pathname cases
ACPICA: Change exception code for invalid pathname in acpi_evaluate_object
ACPICA: Debugger: Add missing object info to namespace dump
ACPICA: Object repair code: Support to add Package wrappers
ACPICA: Update to version 20120320
Boris Ostrovsky (2):
idle, x86: Allow off-lined CPU to enter deeper C states
cpuidle: power_usage should be declared signed integer
Chen Gong (3):
ACPI, APEI, EINJ, limit the range of einj_param
ACPI, APEI, EINJ, new parameter to control trigger action
Update documentation for parameter *notrigger* in einj.txt
Dan Carpenter (2):
thermal: spear13xx: checking for NULL instead of IS_ERR()
ACPI throttling: fix endian bug in acpi_read_throttling_status()
Daniel Lezcano (3):
cpuidle: use the driver's state_count as default
cpuidle: remove useless array definition in cpuidle_structure
cpuidle: remove unused 'governor_data' field
Fabio Estevam (1):
drivers/thermal/thermal_sys.c: fix build warning
Gary Hade (1):
ACPI, APEI: Fix incorrect APEI register bit width check and usage
Igor Murzov (2):
ACPI video: Harden video bus adding.
ACPI video: Don't start video device until its associated input device has been allocated
Jan Beulich (1):
ACPI: consistently use should_use_kmap()
Jiang Liu (2):
ACPI, APEI, Fix ERST header length check
CPER failed to handle generic error records with multiple sections
Joe Perches (4):
thermal_sys: remove unnecessary line continuations
thermal_sys: remove obfuscating used-once macros
thermal_sys: kernel style cleanups
thermal_sys: convert printks to pr_<level>
Julia Lawall (1):
ACPI: processor_driver: add missing kfree
Julian Anastasov (1):
ACPICA: Fix regression in FADT revision checks
Konrad Rzeszutek Wilk (1):
tboot: Add return values for tboot_sleep
Len Brown (9):
ACPI: ignore FADT reset-reg-sup flag
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/.../konrad/xen into tboot
tools turbostat: add summary option
tools turbostat: reduce measurement overhead due to IPIs
tools turbostat: harden against cpu online/offline
Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release
Merge branch 'apei' into release
Merge branch 'd3' into release
Merge branch 'tboot' into release
Lin Ming (4):
ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS
ACPI: Move module parameter gts and bfs to sleep.c
ACPI: Add interface to register/unregister device to/from power resources
ACPI, PCI: Move acpi_dev_run_wake() to ACPI core
Matthew Garrett (3):
ACPI: Evaluate thermal trip points before reading temperature
ACPI: export acpi_kobj
ACPI: Add support for exposing BGRT data
Myron Stowe (1):
ACPI: Fix logic for removing mappings in 'acpi_unmap'
Paul E. McKenney (1):
ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
Petr Vandrovec (1):
ACPI: Fix use-after-free in acpi_map_lsapic
Robert Lee (9):
cpuidle: Add common time keeping and irq enabling
ARM: at91: Consolidate time keeping and irq enable
ARM: kirkwood: Consolidate time keeping and irq enable
ARM: davinci: Consolidate time keeping and irq enable
ARM: omap: Consolidate OMAP3 time keeping and irq enable
ARM: omap: Consolidate OMAP4 time keeping and irq enable
ARM: shmobile: Consolidate time keeping and irq enable
SH: shmobile: Consolidate time keeping and irq enable
ARM: davinci: Fix for cpuidle consolidation changes
ShuoX Liu (1):
cpuidle: add a sysfs entry to disable specific C state for debug purpose.
Tang Liang (1):
x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
Toshi Kani (1):
ACPI: Add CPU hotplug support for processor device objects
Vincenzo Frascino (1):
thermal: add support for thermal sensor present on SPEAr13xx machines
Viresh Kumar (1):
thermal/spear_thermal: replace readl/writel with lighter _relaxed variants
Yinghai Lu (1):
PNPACPI: Fix device ref leaking in acpi_pnp_match
Zhang Rui (1):
ACPI: Introduce ACPI D3_COLD state support
Documentation/ABI/testing/sysfs-firmware-acpi | 20 +
Documentation/acpi/apei/einj.txt | 8 +
Documentation/cpuidle/sysfs.txt | 5 +
arch/arm/include/asm/cpuidle.h | 29 ++
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/cpuidle.c | 21 ++
arch/arm/mach-at91/cpuidle.c | 67 ++--
arch/arm/mach-davinci/cpuidle.c | 83 ++--
arch/arm/mach-kirkwood/cpuidle.c | 72 ++--
arch/arm/mach-omap2/cpuidle34xx.c | 42 +--
arch/arm/mach-omap2/cpuidle44xx.c | 21 +-
arch/arm/mach-shmobile/cpuidle.c | 31 +-
arch/sh/kernel/cpu/shmobile/cpuidle.c | 10 +-
arch/x86/kernel/acpi/boot.c | 3 +-
arch/x86/kernel/smpboot.c | 4 +-
arch/x86/kernel/tboot.c | 9 +-
drivers/acpi/Kconfig | 9 +
drivers/acpi/Makefile | 1 +
drivers/acpi/acpica/Makefile | 4 +-
drivers/acpi/acpica/accommon.h | 1 -
drivers/acpi/acpica/acdebug.h | 8 +-
drivers/acpi/acpica/acevents.h | 21 +-
drivers/acpi/acpica/acglobal.h | 11 +-
drivers/acpi/acpica/achware.h | 32 +-
drivers/acpi/acpica/aclocal.h | 1 +
drivers/acpi/acpica/acmacros.h | 6 +
drivers/acpi/acpica/acnamesp.h | 5 +-
drivers/acpi/acpica/actables.h | 5 +
drivers/acpi/acpica/evevent.c | 4 +-
drivers/acpi/acpica/evglock.c | 4 +-
drivers/acpi/acpica/evgpe.c | 4 +-
drivers/acpi/acpica/evgpeblk.c | 4 +-
drivers/acpi/acpica/evgpeinit.c | 4 +-
drivers/acpi/acpica/evgpeutil.c | 3 +
drivers/acpi/acpica/evmisc.c | 26 +-
drivers/acpi/acpica/evsci.c | 4 +-
drivers/acpi/acpica/evxface.c | 436 +++++++++++-----------
drivers/acpi/acpica/evxfevnt.c | 2 +
drivers/acpi/acpica/evxfgpe.c | 2 +
drivers/acpi/acpica/hwacpi.c | 3 +
drivers/acpi/acpica/hwesleep.c | 247 ++++++++++++
drivers/acpi/acpica/hwgpe.c | 4 +-
drivers/acpi/acpica/hwregs.c | 16 +-
drivers/acpi/acpica/hwsleep.c | 401 ++++----------------
drivers/acpi/acpica/hwtimer.c | 2 +
drivers/acpi/acpica/hwxface.c | 50 +--
drivers/acpi/acpica/hwxfsleep.c | 431 +++++++++++++++++++++
drivers/acpi/acpica/nsdump.c | 15 +-
drivers/acpi/acpica/nsdumpdv.c | 2 +-
drivers/acpi/acpica/nspredef.c | 4 +-
drivers/acpi/acpica/nsrepair.c | 159 +++-----
drivers/acpi/acpica/nsutils.c | 2 +-
drivers/acpi/acpica/tbfadt.c | 8 +-
drivers/acpi/acpica/tbinstal.c | 117 +++++-
drivers/acpi/acpica/tbutils.c | 95 ++---
drivers/acpi/acpica/utdecode.c | 34 +-
drivers/acpi/acpica/utglobal.c | 9 +-
drivers/acpi/acpica/utinit.c | 37 +-
drivers/acpi/acpica/utxface.c | 6 +-
drivers/acpi/apei/apei-base.c | 61 +--
drivers/acpi/apei/cper.c | 2 +
drivers/acpi/apei/einj.c | 17 +-
drivers/acpi/apei/erst.c | 2 +-
drivers/acpi/bgrt.c | 175 +++++++++
drivers/acpi/bus.c | 1 +
drivers/acpi/ec.c | 8 +-
drivers/acpi/nvs.c | 4 +-
drivers/acpi/osl.c | 124 ++----
drivers/acpi/power.c | 166 +++++++-
drivers/acpi/processor_driver.c | 62 ++-
drivers/acpi/processor_idle.c | 34 +-
drivers/acpi/processor_thermal.c | 45 ++-
drivers/acpi/processor_throttling.c | 5 +-
drivers/acpi/reboot.c | 3 +-
drivers/acpi/scan.c | 12 +-
drivers/acpi/sleep.c | 76 +++-
drivers/acpi/thermal.c | 8 +-
drivers/acpi/video.c | 50 ++-
drivers/cpuidle/cpuidle.c | 97 ++++-
drivers/cpuidle/driver.c | 2 +-
drivers/cpuidle/governors/menu.c | 7 +-
drivers/cpuidle/sysfs.c | 40 ++
drivers/pci/pci-acpi.c | 40 +-
drivers/platform/x86/intel_ips.c | 13 +-
drivers/pnp/pnpacpi/core.c | 7 +-
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/spear_thermal.c | 206 ++++++++++
drivers/thermal/thermal_sys.c | 94 ++---
{drivers/acpi/acpica => include/acpi}/acconfig.h | 19 +-
include/acpi/acexcep.h | 7 +-
include/acpi/acnames.h | 12 +-
include/acpi/acpi_bus.h | 7 +
include/acpi/acpiosxf.h | 13 +-
include/acpi/acpixf.h | 229 ++++++++----
include/acpi/actbl.h | 7 +
include/acpi/actypes.h | 22 +-
include/linux/acpi.h | 10 +
include/linux/cpuidle.h | 22 +-
include/linux/platform_data/spear_thermal.h | 26 ++
include/linux/tboot.h | 1 -
tools/power/x86/turbostat/turbostat.8 | 99 +++--
tools/power/x86/turbostat/turbostat.c | 245 ++++++++----
103 files changed, 3197 insertions(+), 1558 deletions(-)
create mode 100644 arch/arm/include/asm/cpuidle.h
create mode 100644 arch/arm/kernel/cpuidle.c
create mode 100644 drivers/acpi/acpica/hwesleep.c
create mode 100644 drivers/acpi/acpica/hwxfsleep.c
create mode 100644 drivers/acpi/bgrt.c
create mode 100644 drivers/thermal/spear_thermal.c
rename {drivers/acpi/acpica => include/acpi}/acconfig.h (92%)
create mode 100644 include/linux/platform_data/spear_thermal.h
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-03-30 21:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-30 11:38 [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge Len Brown
2012-03-30 16:48 ` Rob Lee
2012-03-30 16:48 ` Rob Lee
2012-03-30 19:16 ` Linus Torvalds
2012-03-30 19:32 ` Linus Torvalds
2012-03-30 19:54 ` Len Brown
2012-03-30 21:31 ` [GIT PULL] ACPI & Power Management patches for Linux-3.4-merge - take 2 Len Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.