Re: [git pull] PCI changes for 2.6.33

From: Linus Torvalds
Date: Fri Dec 11 2009 - 15:23:31 EST




On Fri, 11 Dec 2009, Jesse Barnes wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
>
> I've got a section mismatch in here, but the fix will be part of the next
> pull req (updated patch just came in recently).
>
> Probably the biggest change here (at least my change count) is Bjorn's
> MMCONFIG rework. It sets the stage for hot plugging of host bridges and
> _CBA and includes some nice cleanups besides.

Ok, so I got a few conflicts with the iommu/dmar changes (ACS related
changes versus the iommu_init changes) and with the ACPICA update
(acpi_walk_namespace() change in acpiphp_glue - it now takes a post-order
callback too).

I resolved them all, hopefully even correctly, but people should look over
the end result.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/