From: Len Brown <lenb@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: sfi-devel@simplefirmware.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [SFI-devel] linux-next: manual merge of the sfi tree with the acpi tree
Date: Fri, 28 Aug 2009 19:47:34 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.00.0908281946220.27023@localhost.localdomain> (raw)
In-Reply-To: <20090817180610.0de34cab.sfr@canb.auug.org.au>
On Mon, 17 Aug 2009, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sfi tree got a conflict in
> drivers/acpi/tables.c between commit
> 44043a4299724bb386ac7915a57a18b176e9df07 ("ACPI: check acpi_disabled in
> acpi_table_parse()") from the acpi tree and commit
> 55ec50ee899aa3199c126bb4b740abb9a4ab51df ("ACPI: check acpi_disabled in
> acpi_table_parse() and acpi_table_parse_entries()") from the sfi tree.
>
> I used the sfi tree version.
thanks.
this should be fixed now, and both trees should again include
the identical commits where they overlap.
-Len Brown, Intel Open Source Technology Center
prev parent reply other threads:[~2009-08-28 23:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-17 8:06 linux-next: manual merge of the sfi tree with the acpi tree Stephen Rothwell
2009-08-28 23:47 ` Len Brown [this message]
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.2.00.0908281946220.27023@localhost.localdomain \
--to=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfi-devel@simplefirmware.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox