git pull on Linux/ACPI release tree
Hi Linus,
please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release
This will update the files shown below.
thanks!
-Len
arch/i386/kernel/acpi/boot.c | 7 + drivers/acpi/Kconfig | 1 drivers/acpi/Makefile | 2 drivers/acpi/processor_core.c | 15 ++ drivers/acpi/processor_idle.c | 29 +++- drivers/acpi/processor_thermal.c | 38 +++--- drivers/acpi/scan.c | 2 drivers/acpi/thermal.c | 163 ++++++++++++++------------- drivers/acpi/video.c | 2 9 files changed, 157 insertions(+), 102 deletions(-)
through these commits:
Al Viro:
[ACPI] IA64 build: blacklist.c is used only on X86
Borislav Petkov:
[ACPI] delete "default y" on Kconfig for ibm_acpi extras driver
David Shaohua Li:
[ACPI] properly detect pmtimer on ASUS a8v motherboard
Thomas Renninger:
[ACPI] fix HP nx8220 boot hang regression
[ACPI] Allow return to active cooling mode once passive mode is entered [ACPI] Fix Null pointer deref in video/lcd/brightness
Venkatesh Pallipadi:
[ACPI] Prefer _CST over FADT for C-state capabilities [ACPI] Add support for FADT P_LVL2_UP flag
[ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS
with this log:
commit 220ec706645ecf13ee3a87046d17316303905698
Merge: 16071a073d44ef3ca3f79d0b49371a79464d9ac01cbf4c563c0eaaf11c552a88b374e213181c6ddd
Author: Len Brown <[email protected]> Date: Thu Dec 1 01:42:17 2005 -0500
Pull 3410 into release branch
commit 16071a073d44ef3ca3f79d0b49371a79464d9ac0
Merge: b7639dafb4e175ddd637425da5ff65f03e08028ecd8e2b48daee891011a4f21e2c62b210d24dcc9e
Author: Len Brown <[email protected]> Date: Thu Dec 1 01:39:55 2005 -0500
Pull 5452 into release branch
commit b7639dafb4e175ddd637425da5ff65f03e08028e
Merge: c8734a9663806b7ebd3b5e33bae65a60ff6553bd59d399d357a7705568f424c6e861ee8657f7f655
Author: Len Brown <[email protected]> Date: Thu Dec 1 01:39:41 2005 -0500
Pull 5571 into release branch
commit cd8e2b48daee891011a4f21e2c62b210d24dcc9e
Author: Venkatesh Pallipadi <[email protected]> Date: Fri Oct 21 19:22:00 2005 -0400
[ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS
http://bugzilla.kernel.org/show_bug.cgi?id=5452
commit 59d399d357a7705568f424c6e861ee8657f7f655
Author: Thomas Renninger <[email protected]> Date: Tue Nov 8 05:27:00 2005 -0500
[ACPI] Fix Null pointer deref in video/lcd/brightness
http://bugzilla.kernel.org/show_bug.cgi?id=5571
commit 1cbf4c563c0eaaf11c552a88b374e213181c6ddd
Author: Thomas Renninger <[email protected]> Date: Thu Sep 16 11:07:00 2004 -0400
[ACPI] Allow return to active cooling mode once passive mode is entered
http://bugzilla.kernel.org/show_bug.cgi?id=3410
https://bugzilla.novell.com/show_bug.cgi?id=131543
commit c8734a9663806b7ebd3b5e33bae65a60ff6553bd
Merge: 8e9887cc3b8d9f1c88c6f3842346a9478e52718fe6e87b4bfe3720b4308a8e669078d9be58bc9780
Author: Len Brown <[email protected]> Date: Wed Nov 30 22:28:15 2005 -0500
Pull 5283 into release branch
commit e6e87b4bfe3720b4308a8e669078d9be58bc9780
Author: David Shaohua Li <[email protected]> Date: Wed Sep 21 01:35:00 2005 -0400
[ACPI] properly detect pmtimer on ASUS a8v motherboard
Handle FADT 2.0 xpmtmr address 0 case.
http://bugzilla.kernel.org/show_bug.cgi?id=5283
commit 8e9887cc3b8d9f1c88c6f3842346a9478e52718f
Merge: 0a47c906342e2447003e207d23917dfa5c912071d2149b542382bfc206cb28485108f6470c979566
Author: Len Brown <[email protected]> Date: Wed Nov 30 22:22:52 2005 -0500
Auto-update from upstream
commit 0a47c906342e2447003e207d23917dfa5c912071
Author: Borislav Petkov <[email protected]> Date: Wed Nov 30 22:12:45 2005 -0500
[ACPI] delete "default y" on Kconfig for ibm_acpi extras driver
commit 5d8e7aa6e5c21e14843404c5e4c04d4cf043e40e
Author: Al Viro <[email protected]> Date: Thu Sep 22 01:15:57 2005 -0400
[ACPI] IA64 build: blacklist.c is used only on X86
(cherry picked from ef4611613657dfb8af8d336f2f61f08cfcdc9d8a commit)
commit 7dac562f6d89b3f70c3f12b0e17878b07af42298
Merge: 3141b6708dd9ad09b6667c23393cfdc25b1277714c0335526c95d90a1d958e0059f40a5745fc7c5d
Author: Len Brown <[email protected]> Date: Wed Nov 30 21:55:14 2005 -0500
Pull 5165 into release branch
commit 3141b6708dd9ad09b6667c23393cfdc25b127771
Merge: d2149b542382bfc206cb28485108f6470c979566bd7ce5b5ff930c29b1c0405051e9c9388660b785
Author: Len Brown <[email protected]> Date: Wed Nov 30 21:55:02 2005 -0500
Pull 5221 into release branch
commit bd7ce5b5ff930c29b1c0405051e9c9388660b785
Author: Thomas Renninger <[email protected]> Date: Mon Oct 3 10:39:00 2005 -0700
[ACPI] fix HP nx8220 boot hang regression
This patch reverts the acpi_bus_find_driver() return value check that came in via the PCI tree via 3fb02738b0fd36f47710a2bf207129efd2f5daa2
[PATCH] acpi bridge hotadd: Allow ACPI .add and .start
operations to be done independently
This particular change broke booting of some HP/Compaq laptops unless acpi=noirq is used.
http://bugzilla.kernel.org/show_bug.cgi?id=5221
https://bugzilla.novell.com/show_bug.cgi?id=116763
commit 4c0335526c95d90a1d958e0059f40a5745fc7c5d
Author: Venkatesh Pallipadi <[email protected]> Date: Thu Sep 15 12:20:00 2005 -0400
[ACPI] Add support for FADT P_LVL2_UP flag which tells us if C2 is valid for UP-only, or SMP.
As there is no separate bit for C3, use P_LVL2_UP bit to cover both C2 and C3.
http://bugzilla.kernel.org/show_bug.cgi?id=5165
(cherry picked from 28b86b368af3944eb383078fc5797caf2dc8ce44 commit)
commit 6d93c64803a5fea84839789aae13290419c62d92
Author: Venkatesh Pallipadi <[email protected]> Date: Thu Sep 15 12:19:00 2005 -0400
[ACPI] Prefer _CST over FADT for C-state capabilities
Note: This ACPI standard compliance may cause regression on some system, if they have _CST present, but _CST value is bogus. "nocst" module parameter should workaround that regression.
http://bugzilla.kernel.org/show_bug.cgi?id=5165
(cherry picked from 883baf7f7e81cca26f4683ae0d25ba48f094cc08 commit)
Hi Linus,
please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release
This will update the file shown below.
thanks!
-Len
drivers/acpi/processor_idle.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-)
through these commits:
David Shaohua Li:
[ACPI] correct earlier SMP deep C-states on HT patch
with this log:
commit 927fe18397b3b1194a5b26b1d388d97e391e5fd2
Merge: e4f5c82a92c2a546a16af1614114eec19120e40a1e483969930a82e16767884449f3a121a817ef00
Author: Len Brown <[email protected]> Date: Mon Dec 5 17:08:40 2005 -0500
Pull 5165 into release branch
commit 1e483969930a82e16767884449f3a121a817ef00
Author: David Shaohua Li <[email protected]> Date: Thu Dec 1 17:00:00 2005 -0500
[ACPI] correct earlier SMP deep C-states on HT patch
http://bugzilla.kernel.org/show_bug.cgi?id=5165
Change polarity of test for PLVL2_UP flag.
Skip promotion/demotion code when not needed.
Hi Linus,
please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release
This will update the files shown below.
thanks!
-Len
drivers/acpi/processor_thermal.c | 4 ++-- drivers/acpi/utilities/utmisc.c | 20 ++++++++++---------- include/acpi/acglobal.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)
through these commits:
Alex Williamson:
[ACPI] increase owner_id limit to 64 from 32
Len Brown:
[ACPI] fix build warning from owner_id patch
Thomas Renninger:
[ACPI] fix passive cooling regression
with this log:
commit 9d6be4bed65a3bd36ab2de12923bff4f4530bd86
Author: Len Brown <[email protected]> Date: Thu Dec 22 22:23:06 2005 -0500
[ACPI] fix build warning from owner_id patch
commit 75b245b3259133360845bc6de3aecb8a6bd6ab59
Author: Thomas Renninger <[email protected]> Date: Wed Dec 21 01:29:00 2005 -0500
[ACPI] fix passive cooling regression
Return logic was inverted.
Going for changing the return value to not return zero as it is makes more sense regarding the naming of the function (cpu_has_cpufreq()).
http://bugzilla.kernel.org/show_bug.cgi?id=3410
commit 05465fd5622202d65634b3a9a8bcc9cbb384a82a
Author: Alex Williamson <[email protected]> Date: Thu Dec 8 15:37:00 2005 -0500
[ACPI] increase owner_id limit to 64 from 32
This is an interim patch until changes in an updated ACPICA core increase the limit to 255.
Hi Linus,
please pull this batch of trivial patches from:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release
This will update the files shown below.
thanks!
-Len
Documentation/DocBook/kernel-api.tmpl | 1 Documentation/kernel-parameters.txt | 4 +++ Documentation/pm.txt | 2 - MAINTAINERS | 2 - drivers/acpi/Kconfig | 2 - drivers/acpi/scan.c | 27 +++++++++++++--------- drivers/acpi/tables.c | 4 +-- 7 files changed, 26 insertions(+), 16 deletions(-)
through these commits:
Borislav Petkov:
[ACPI] remove Kconfig "default y" for laptop drivers
Len Brown:
[ACPI] document processor.nocst parameter
[ACPI] [email protected] replaces [email protected] [ACPI] reduce kernel size: move 5BK .bss to 2.5KB .init.data
[ACPI] [email protected] replaces [email protected]
Randy Dunlap:
[ACPI] fix kernel-doc warnings in acpi/scan.c
with this log:
commit f9a204e1de73a7007de66fb289e1d64a7665c9b4
Author: Borislav Petkov <[email protected]> Date: Fri Jan 6 01:31:00 2006 -0500
[ACPI] remove Kconfig "default y" for laptop drivers
commit d758a8fa8ce0566947677f7e70bf70c57ad9445c
Author: Randy Dunlap <rdunlap-/[email protected]> Date: Fri Jan 6 01:31:00 2006 -0500
[ACPI] fix kernel-doc warnings in acpi/scan.c
commit 036d25f79ddfbc9878da24ef8e468a6d22caa605
Author: Len Brown <[email protected]> Date: Fri Jan 6 16:19:26 2006 -0500
[ACPI] [email protected] replaces [email protected]
commit 04348e69e7e78ad69a09b2e1157f628d6c764370
Author: Len Brown <[email protected]> Date: Fri Dec 30 02:44:59 2005 -0500
[ACPI] reduce kernel size: move 5BK .bss to 2.5KB .init.data
put __initdata on sdt_entry[], as it is accessed only by __init functions.
http://bugzilla.kernel.org/show_bug.cgi?id=1311
commit 6968e50c2b53805219618203db3d98566dfa1fdd
Author: Len Brown <[email protected]> Date: Fri Dec 30 00:32:49 2005 -0500
[ACPI] [email protected] replaces [email protected]
commit 41c0d8680f7f24e1abaaeeabc6723277b2e34b81
Author: Len Brown <[email protected]> Date: Wed Dec 28 12:43:51 2005 -0500
[ACPI] document processor.nocst parameter
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 4 lines · Len Brown
please pull this batch of trivial patches from:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.gitrelease
Len,
I _really_ wish you wouldn't have those automatic merges.
Why do you do them? They add nothing but ugly and unnecessary history, and in this pull, I think almost exactly half of the commits were just these empty merges.
There's just no point, except to make the history harder to read.
So please stop it. You have some of the ugliest history around, and it's all just because you have some automated process that merges unnecessarily all the time.
If you do merges because you want to _test_ the development with a merged tree, that doesn't have to happen in the development branch itself. Nobody else cares about such a merge except the tester (unless the test fails of course, and you need to fix up the result - at which point it's not an automated merge any more).
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html