Hey Stephen,
On Thu, Feb 10, 2011 at 10:28:35PM -0500, Stephen Rothwell wrote:
> Hi Borislav,
>
> Today's linux-next merge of the edac-amd tree got a conflict in
> include/linux/pci_ids.h between commit
> 41b2610c3443e6c4760e61fc10eef73f96f9f6a5 ("x86, amd: Extend AMD
> northbridge caching code to support "Link Control" devices") from the tip
> tree and commit 3d019f87099415f5f0a2f75b6f828db17e6e9445 ("PCI: Rename
> CPU PCI id define") from the edac-amd tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc include/linux/pci_ids.h
> index 5aaf45e,5411e7b..0000000
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@@ -517,8 -517,7 +517,8 @@@
> #define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302
> #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
> #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
> - #define PCI_DEVICE_ID_AMD_15H_NB_MISC 0x1603
> + #define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603
> +#define PCI_DEVICE_ID_AMD_15H_NB_LINK 0x1604
Yeah, we decided to call all CPU PCI devices on F15h and later simply by
their PCI function numbers for simplicity. I'll fix the .._LINK thing
when all the merging settles after .39-rc1.
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
--
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
