linux-kernel - linux-next: manual merge of the acpi tree with the pci 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>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 26 Nov 2009 13:22:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Len Brown <lenb@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lin Ming <ming.m.lin@...el.com>,
	Bob Moore <robert.moore@...el.com>,
	Bjorn Helgaas <bjorn.helgaas@...com>,
	Jesse Barnes <jbarnes@...tuousgeek.org>
Subject: linux-next: manual merge of the acpi tree with the pci tree

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/pci/hotplug/acpiphp_glue.c between commit
204d49a5613a06eb2fa5c3b842a29b1336cc7995 ("PCI hotplug: move IOAPIC
support from acpiphp to ioapic driver") from the pci tree and commit
2263576cfc6e8f6ab038126c3254404b9fcb1c33 ("ACPICA: Add post-order
callback to acpi_walk_namespace") from the acpi tree.

The former moved part of the code modified by the latter into another
file.  All the calls to acpi_walk_namespace() seem to have been removed
in this process.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped