From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
linux-acpi@vger•kernel.org
Subject: Re: linux-next: Tree for June 18
Date: Thu, 18 Jun 2009 16:47:15 +1000 [thread overview]
Message-ID: <20090618164715.f16bb01c.sfr@canb.auug.org.au> (raw)
In-Reply-To: <alpine.LFD.2.00.0906180141130.8921@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 856 bytes --]
Hi Len,
On Thu, 18 Jun 2009 01:47:06 -0400 (EDT) Len Brown <lenb@kernel•org> wrote:
>
> > Merging acpi/test
> > CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
> > CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
>
> Okay, I've dropped the toshiba_acpi branch from test, pending a refresh
>
> > [master 28e994e] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test"
>
> Okay, I've dropped the oqo branch from test, pending a refresh
>
> > CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
>
> As I've sync'd my test tree with Linus' tree in preparation for
> a merge, it seems that I need a refreshed eeepc-laptop branch too:-(
Thanks for all that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-06-18 6:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-18 4:59 linux-next: Tree for June 18 Stephen Rothwell
2009-06-18 5:47 ` Len Brown
2009-06-18 6:47 ` Stephen Rothwell [this message]
2009-06-18 12:30 ` [s390x] Next June 18: boot failure Sachin Sant
2009-06-18 13:44 ` Martin Schwidefsky
2009-06-19 4:05 ` Sachin Sant
2009-06-22 7:27 ` Heiko Carstens
2009-06-22 9:05 ` Sachin Sant
2009-06-18 16:55 ` [PATCH -next] bnx2i/cnic: kconfig interactions Randy Dunlap
2009-06-18 18:39 ` Michael Chan
-- strict thread matches above, loose matches on Subject: below --
2010-06-18 4:54 linux-next: Tree for June 18 Stephen Rothwell
2008-06-18 7:57 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=20090618164715.f16bb01c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=lenb@kernel$(echo .)org \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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