From: Stephen Rothwell <sfr@canb.auug.org.au>
To: sfi-devel@simplefirmware.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Feng Tang <feng.tang@intel.com>, Len Brown <len.brown@intel.com>
Subject: linux-next: manual merge of the sfi tree with the acpi tree
Date: Mon, 17 Aug 2009 18:06:19 +1000 [thread overview]
Message-ID: <20090817180619.214fb0f0.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 742 bytes --]
Hi all,
Today's linux-next merge of the sfi tree got a conflict in
arch/x86/include/asm/io_apic.h arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/io_apic.c between commit
f488a00f3759327c687e17858c07a1b0ea811cf0 ("ACPI, x86: remove ACPI
dependency on some IO-APIC routines") from the acpi tree and commit
2a98e7573b83bac1a79292a428090ee352626216 ("ACPI, x86: expose some IO-APIC
routines when CONFIG_ACPI=n") from the sfi tree.
The latter seems to be a superset of the former (with one name change
uniq_ioapic_id -> io_apic_unique_id). I fixed it up (using the sfi
trees' versions) and can carry the fix as necessary.
--
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 reply other threads:[~2009-08-17 8:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-17 8:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-08-17 8:06 linux-next: manual merge of the sfi tree with the acpi tree 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=20090817180619.214fb0f0.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=feng.tang@intel.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfi-devel@simplefirmware.org \
/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