From: Len Brown <lenb@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, "Rafael J. Wysocki" <rjw@sisk•pl>,
Jesse Barnes <jbarnes@virtuousgeek•org>
Subject: Re: linux-next: manual merge of acpi tree
Date: Fri, 13 Jun 2008 01:09:31 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.1.10.0806130107530.8340@localhost.localdomain> (raw)
In-Reply-To: <20080613145357.1ea9f643.sfr@canb.auug.org.au>
On Fri, 13 Jun 2008, Stephen Rothwell wrote:
> Hi Len, Rafael,
>
> Today's linux-next merge of the acpi tree got a context conflict in
> drivers/acpi/sleep/main.c between commit
> d8f3de0d2412bb91639cfefc5b3c79dbf3812212 ("Suspend-related patches for
> 2.6.27") from the pci tree and a couple of commits that are duplicate in
> the pci and acpi trees ("ACPI PM: acpi_pm_device_sleep_state() cleanup"
> and "ACPI PM: Remove obsolete Toshiba workaround").
>
> I used the version from the pci tree.
>
What do you use to merge?
Jesse pulled my suspend branch, so you should get the exact same commit
id's for 3 patches in both his tree and mine.
-Len
next prev parent reply other threads:[~2008-06-13 5:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-13 4:53 linux-next: manual merge of acpi tree Stephen Rothwell
2008-06-13 5:09 ` Len Brown [this message]
2008-06-13 6:02 ` Stephen Rothwell
2008-06-13 8:45 ` Rafael J. Wysocki
2008-06-13 15:49 ` linux-next: managing a web of git trees Jesse Barnes
2008-06-13 16:01 ` Linus Torvalds
2008-06-13 16:28 ` Jesse Barnes
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=alpine.LFD.1.10.0806130107530.8340@localhost.localdomain \
--to=lenb@kernel$(echo .)org \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--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