From: Harvey Harrison <harvey.harrison@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Len Brown <lenb@kernel.org>,
linux-next@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Andi Kleen <ak@suse.de>
Subject: Re: linux-next: manual merge of the acpi tree
Date: Tue, 15 Jul 2008 22:35:13 -0700 [thread overview]
Message-ID: <1216186513.28841.0.camel@brick> (raw)
In-Reply-To: <20080716153316.6a0cd6df.sfr@canb.auug.org.au>
CC'ing Andi whom I believe is looking after ACPI while Len is away.
On Wed, 2008-07-16 at 15:33 +1000, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got conflicts in
> arch/x86/kernel/acpi/sleep.c between commits
> 3bf2e77453a87c22eb57ed4926760ac131c84459 ("x86, suspend, acpi: enter Big
> Real Mode") and 065cb3dfe24978651caedfa54da585388ad15dde ("x86, suspend,
> acpi: correct and add comments about Big Real Mode") from Linus' tree and
> commit 60d40a50886415040888bde5133ccfeab40d945f ("x86 ACPI: normalize
> segment descriptor register on resume") from the acpi tree (which also
> appears to be in Linus' tree).
>
> I used the version from Linus' tree.
next prev parent reply other threads:[~2008-07-16 5:35 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 5:33 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-07-16 5:35 ` Harvey Harrison [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 2:10 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-21 2:55 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-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=1216186513.28841.0.camel@brick \
--to=harvey.harrison@gmail.com \
--cc=ak@suse.de \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.