From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 00:21:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: upstream/snapshot3+hdmi~11192
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=978ca164bd9f30bd51f71dad86d8c3797f7add76;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits)
  amd64_edac: Fix decode_syndrome types
  amd64_edac: Fix DCT argument type
  amd64_edac: Fix ranges signedness
  amd64_edac: Drop local variable
  amd64_edac: Fix PCI config addressing types
  amd64_edac: Fix DRAM base macros
  amd64_edac: Fix node id signedness
  amd64_edac: Drop redundant declarations
  amd64_edac: Enable driver on F15h
  amd64_edac: Adjust ECC symbol size to F15h
  amd64_edac: Simplify scrubrate setting
  PCI: Rename CPU PCI id define
  amd64_edac: Improve DRAM address mapping
  amd64_edac: Sanitize ->read_dram_ctl_register
  amd64_edac: Adjust sys_addr to chip select conversion routine to F15h
  amd64_edac: Beef up early exit reporting
  amd64_edac: Revamp online spare handling
  amd64_edac: Fix channel interleave removal
  amd64_edac: Correct node interleaving removal
  amd64_edac: Add support for interleaved region swapping
  ...

Fix up trivial conflict in include/linux/pci_ids.h due to
AMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new
AMD_15H_NB_LINK entry.
---

978ca164bd9f30bd51f71dad86d8c3797f7add76
diff --cc arch/x86/kernel/amd_nb.c
index 6563419,863e062..6801959
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@@ -12,10 -12,10 +12,10 @@@
  
  static u32 *flush_words;
  
 -struct pci_device_id amd_nb_misc_ids[] = {
 +const struct pci_device_id amd_nb_misc_ids[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_MISC) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
  	{}
  };
  EXPORT_SYMBOL(amd_nb_misc_ids);
diff --cc include/linux/pci_ids.h
index 580de67,5411e7b..5b038d4
--- 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
  #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
  #define PCI_DEVICE_ID_AMD_LANCE		0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001