On Wednesday, October 15, 2008 8:24 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/pcie/aspm.c between commit
> e1f4f59d1ab9ebac44830d6ae450fb358ac559d3 ("PCI: Fix pcie_aspm=force")
> from Linus' tree and commit 4f56ffe4ff214284f9c92037f9ad5f389a74bb84
> ("PCI: probing debug message uniformization") from the pci tree.
>
> Just context. I fixed it up (see below).
Yeah I sent that fix to Linus but it's not in my linux-next tree. Looks like
I'll have to do some re-basing to fix up Ben's PPC legacy stuff so I can take
care of it then.
Jesse
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
