git-acpi in linux-next
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi Andrew,
Quoted 7 lines · On Wed, 23 Jul 2008 13:46:43 -0700 Andrew Morton <[email protected]>…
For the past few days I've been seeing a substantial amount of material in git+ssh://master.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test which is not in linux-next.
Is this known about and deliberate?
Noone seems capable of answering a simple question about what tree I should be fetching. Len's tree (last I tried) had significant conflicts with what Andi put into Linus' tree. I have asked at least twice for direction from the acpi folks.
I will try Len's tree again today (though the last update there is June 28 so I am not hopeful).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Hi all,
Quoted 3 lines · On Thu, 24 Jul 2008 10:12:17 +1000 Stephen Rothwell <[email protected]>…
I will try Len's tree again today (though the last update there is June 28 so I am not hopeful).
I merged Len's tree and fixed all the conflicts and the final diff from before to after the merge is below.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
drivers/acpi/events/evxface.c +2 -0
@@ -114,6 +114,8 @@ acpi_install_fixed_event_handler(u32 event,ACPI_FUNCTION_TRACE (acpi_install_fixed_event_handler); +WARN_ON (acpi_disabled); +/* Parameter validation */ if (event >ACPI_EVENT_MAX ) {
drivers/acpi/namespace/nsxfeval.c +2 -0
@@ -390,6 +390,8 @@ acpi_walk_namespace(acpi_object_type type,ACPI_FUNCTION_TRACE (acpi_walk_namespace); +WARN_ON (acpi_disabled); +/* Parameter validation */ if ((type >ACPI_TYPE_LOCAL_MAX ) || (!max_depth) || (!user_function)) {
drivers/acpi/utilities/utmisc.c +2 -0
@@ -1024,6 +1024,7 @@ acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...) {va_list args; +warn_on_slowpath (module_name, line_number);acpi_os_printf ("ACPI Error (%s-%04d): " , module_name, line_number);va_start (args, format);
@@ -1038,6 +1039,7 @@ acpi_ut_exception(const char *module_name, {va_list args; +warn_on_slowpath (module_name, line_number);acpi_os_printf ("ACPI Exception (%s-%04d): %s, " , module_name, line_number,acpi_format_exception (status));
Quoted 9 lines · Stephen Rothwell
Hi all,
Quoted 3 lines · On Thu, 24 Jul 2008 10:12:17 +1000 Stephen Rothwell <[email protected]>…
I will try Len's tree again today (though the last update there is June 28 so I am not hopeful).
I merged Len's tree and fixed all the conflicts and the final diff from before to after the merge is below.
Sorry for the trouble. Len's tree is still the current one, but I haven't fully fixed up yet for post 2.6.27. I'll prepare a new one for you soon The git URL will be different, but I'm sending you details.
-Andi
Quoted 8 lines · Stephen Rothwell
Quoted 6 lines · On Wed, 23 Jul 2008 13:46:43 -0700 Andrew Morton <[email protected]>…
For the past few days I've been seeing a substantial amount of material in git+ssh://master.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test which is not in linux-next.
Is this known about and deliberate?
Quoted 7 lines
Noone seems capable of answering a simple question about what tree I should be fetching. Len's tree (last I tried) had significant conflicts with what Andi put into Linus' tree. I have asked at least twice for direction from the acpi folks.
I will try Len's tree again today (though the last update there is June 28 so I am not hopeful).
Len's tree is "deactivated" while he is on sabbatical... I can't tell you what tree you should merge into -next, but I can tell you Len's tree is not it...
Signature · 4 lines
"One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh