From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, Matt Mackall <mpm@selenic•com>,
"Rafael J. Wysocki" <rjw@sisk•pl>
Subject: linux-next: manual merge of the acpi tree
Date: Tue, 21 Oct 2008 13:55:09 +1100 [thread overview]
Message-ID: <20081021135509.9435493b.sfr@canb.auug.org.au> (raw)
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
arch/x86/kernel/acpi/sleep.c between commit
3038edabf48f01421c621cb77a712b446d3a5d67 ("x86 ACPI: fix breakage of
resume on 64-bit UP systems with SMP kernel") from Linus' tree and commit
d0d0f7432c9cbd52cb2f31d499f8292b13a7ecac ("x86: remove magic number from
ACPI sleep stack buffer") from the acpi tree.
Just overlapping context. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/acpi/sleep.c
index c44cd6d,55d10cb..0000000
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@@ -98,9 -97,7 +98,9 @@@ int acpi_save_state_mem(void
#else /* CONFIG_64BIT */
header->trampoline_segment = setup_trampoline() >> 4;
#ifdef CONFIG_SMP
- stack_start.sp = temp_stack + 4096;
+ stack_start.sp = temp_stack + sizeof(temp_stack);
+ early_gdt_descr.address =
+ (unsigned long)get_cpu_gdt_table(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
saved_magic = 0x123456789abcdef0;
next reply other threads:[~2008-10-21 2:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-21 2:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 2:10 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-12-01 2:55 ` Len Brown
2008-12-01 3:02 ` Stephen Rothwell
2008-12-01 4:11 ` Len Brown
2008-12-01 4:37 ` Stephen Rothwell
2008-10-20 4:45 Stephen Rothwell
2008-10-15 4:23 Stephen Rothwell
2008-10-15 16:10 ` Bjorn Helgaas
2008-10-15 4:14 Stephen Rothwell
2008-08-25 5:48 Stephen Rothwell
2008-07-17 4:22 Stephen Rothwell
2008-07-17 7:24 ` Adrian Bunk
2008-07-18 0:37 ` Stephen Rothwell
2008-07-17 4:05 Stephen Rothwell
2008-07-17 4:00 Stephen Rothwell
2008-07-17 4:29 ` Stephen Rothwell
2008-07-16 5:33 Stephen Rothwell
2008-07-16 5:35 ` Harvey Harrison
2008-07-09 3:13 Stephen Rothwell
2008-07-08 3:03 Stephen Rothwell
2008-07-08 8:18 ` Stephen Rothwell
2008-07-08 2:59 Stephen Rothwell
2008-07-08 14:33 ` Rafael J. Wysocki
2008-06-30 5:59 Stephen Rothwell
2008-06-30 6:09 ` Stephen Rothwell
2008-06-30 9:03 ` Ingo Molnar
2008-06-27 3:14 Stephen Rothwell
2008-06-26 4:21 Stephen Rothwell
2008-06-25 4:20 Stephen Rothwell
2008-06-25 7:15 ` Ingo Molnar
2008-06-25 15:59 ` Stephen Rothwell
2008-06-25 16:29 ` Ingo Molnar
2008-06-25 19:18 ` Len Brown
2008-06-25 19:57 ` Ingo Molnar
2008-06-26 22:42 ` Len Brown
2008-06-27 7:17 ` Ingo Molnar
2008-06-25 14:24 ` Stephen Rothwell
2008-06-25 4:13 Stephen Rothwell
2008-06-23 4:19 Stephen Rothwell
2008-06-23 21:56 ` Ingo Molnar
2008-06-16 4:03 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081021135509.9435493b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpm@selenic$(echo .)com \
--cc=rjw@sisk$(echo .)pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox