From: Adrian Bunk <bunk@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Len Brown <lenb@kernel•org>,
linux-next@vger•kernel.org, Andi Kleen <andi@firstfloor•org>
Subject: Re: linux-next: manual merge of the acpi tree
Date: Thu, 17 Jul 2008 10:24:49 +0300 [thread overview]
Message-ID: <20080717072449.GN17329@cs181140183.pp.htv.fi> (raw)
In-Reply-To: <20080717142205.064285ad.sfr@canb.auug.org.au>
On Thu, Jul 17, 2008 at 02:22:05PM +1000, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a conflict in
> arch/x86/mm/srat_32.c against Linus' tree.
>
> I used the version in Linus' tree. Could you do a merge with Linus' tree
> for tomorrow?
You seem to still pull Len's tree?
> Cheers,
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
next prev parent reply other threads:[~2008-07-17 7:25 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-17 4:22 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-07-17 7:24 ` Adrian Bunk [this message]
2008-07-18 0:37 ` Stephen Rothwell
-- 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: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=20080717072449.GN17329@cs181140183.pp.htv.fi \
--to=bunk@kernel$(echo .)org \
--cc=andi@firstfloor$(echo .)org \
--cc=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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