tree f7955bc42bab82330d230274210884dd78315f21
parent bafb0762cb6a906eb4105cccfb3bcd90be7f40d2
parent 398443471f1698003832972637d5508a0c0809e0
author Linus Torvalds <torvalds@linux-foundation.org> 1504636516 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1504636516 -0700
mergetag object 398443471f1698003832972637d5508a0c0809e0
 type commit
 tag edac_for_4.14
 tagger Borislav Petkov <bp@suse.de> 1504534775 +0200
 
 * pnd2_edac: A minimal sideband driver (Tony Luck)
 
 * small-ish cleanups and fixes all over the place.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAlmtYQoACgkQEsHwGGHe
 VUq14w//V+yaHVLh6Me6zHxUeJO4o+dTWw56cSNRRNDUTZXJAEsi0GaKZ0YvLT6m
 M34KgYLGXFOMY3T3v3SM88xKW5dmTV8okKiuAMSxeiyOyL3TIiT32uDKiYwekD2t
 3pJ6KuTXHCpEYnchI9mPP1ccohxHt/QOi+nt0wbuZnsOAAwUToI4+fOvmjQPgACS
 Hg47pKoSU9j7DDbTDtisKVMNJGkL7wdwuA0XtB8eww1pYaPocIv8WO0mUbEUQ/bD
 W5O+rLbwVNHcwU4vI4e+YPXpk1FJke7qCabje1h50yzRFoK3EQP65cGoIX/fxKDt
 9tsiKQSV/Y0fXntcXtJuwYN2z1ykzk7o4LLVkhX255JqtwFYxLgf1a0e3ZLV7mvC
 p+yB9moWis/zpfdAuazoKT5R3W1Gl/CpjvYv34lSJUipR10OLvNGKtg6CAlBfhbw
 CEfzIX/3mQ+XSyOS3ofESbVNMjOY6CfQMgT+0sTKz5q7/gDLinGuh+J/zS5ze/lv
 FugGn2PeovfIVo0OLU1dSyHKHE6enDIkHvS0rcGXBks88lARQlHAQuMlR37itmd5
 KfW/a/W4rui4io80E2xlBFkamShTZe/Kx2Z9q9OMc0ut7zcPfREqB4Gg+lUGGOaL
 1cA76rZ3d9A6Yy8ARlCVa0Q9AFyMsjDstLE3iG5wrQLMfHA93pI=
 =gR6C
 -----END PGP SIGNATURE-----

Merge tag 'edac_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:

 - pnd2_edac: A minimal sideband driver (Tony Luck)

 - small-ish cleanups and fixes all over the place

* tag 'edac_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, mce_amd: Get rid of local var in amd_filter_mce()
  EDAC, mce_amd: Get rid of most struct cpuinfo_x86 uses
  EDAC, mce_amd: Rename decode_smca_errors() to decode_smca_error()
  EDAC: Make device_type const
  EDAC, pnd2: Properly toggle hidden state for P2SB PCI device
  EDAC, pnd2: Conditionally unhide/hide the P2SB PCI device to read BAR
  EDAC, pnd2: Mask off the lower four bits of a BAR
  EDAC, thunderx: Fix error handling path in thunderx_lmc_probe()
  EDAC, altera: Fix error handling path in altr_edac_device_probe()
  EDAC, pnd2: Build in a minimal sideband driver for Apollo Lake
  EDAC, sb_edac: Classify memory mirroring modes
  EDAC, cpc925, ppc4xx: Convert to using %pOF instead of full_name
  EDAC: Get rid of mci->mod_ver
  EDAC: Constify attribute_group structures
  EDAC, mce_amd: Use cpu_to_node() to find the node ID