linux-kernel - linux-next: manual merge of the sfi tree with the acpi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20090817180619.214fb0f0.sfr@canb.auug.org.au>
Date:	Mon, 17 Aug 2009 18:06:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	<sfi-devel@...plefirmware.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Feng Tang <feng.tang@...el.com>,
	Len Brown <len.brown@...el.com>
Subject: linux-next: manual merge of the sfi tree with the acpi tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped