diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 18:44:39 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 18:44:39 -0700 | 
| commit | 1cc3880a3c99f1be73f9024bd9db6248ffdcec70 (patch) | |
| tree | 126762bc7ef642bda9ba234be65b47ebcd9f9d47 /net/unix | |
| parent | 490e142209da64243577a997b6d2ed050684ef7b (diff) | |
| parent | 3f37a36b6282621d7c5a99b6911275f989766996 (diff) | |
Merge tag 'edac_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov:
 "It was pretty busy in EDAC land this time:
   - Altera Arria10 L2 cache and On-Chip RAM ECC handling (Thor Thayer)
   - Remove ad-hoc buffering of MCE records in sb_edac and i7core_edac
     (Tony Luck)
   - Do not register sb_edac with pci_register_driver() (Tony Luck)
   - Add support for Skylake to ie31200_edac (Jason Baron)
   - Do not register amd64_edac with pci_register_driver() (Borislav
     Petkov)
  ... plus the usual round of cleanups and fixes all over the place"
* tag 'edac_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (25 commits)
  EDAC, amd64_edac: Drop pci_register_driver() use
  EDAC, ie31200_edac: Add Skylake support
  EDAC, sb_edac: Use cpu family/model in driver detection
  EDAC, i7core: Remove double buffering of error records
  EDAC, amd64_edac: Issue driver banner only on success
  ARM: socfpga: Initialize Arria10 OCRAM ECC on startup
  EDAC: Increment correct counter in edac_inc_ue_error()
  EDAC, sb_edac: Remove double buffering of error records
  EDAC: Fix used after kfree() error in edac_unregister_sysfs()
  EDAC, altera: Avoid unused function warnings
  EDAC, altera: Remove useless casts
  ARM: socfpga: Enable Arria10 OCRAM ECC on startup
  EDAC, altera: Add Arria10 OCRAM ECC support
  Documentation: dt: socfpga: Add Altera Arria10 OCRAM binding
  EDAC, altera: Make OCRAM ECC dependency check generic
  EDAC, altera: Add register offset for ECC Enable
  EDAC, altera: Extract error inject operations to a struct fops
  ARM: socfpga: Enable Arria10 L2 cache ECC on startup
  EDAC, altera: Add Arria10 L2 Cache ECC handling
  Documentation, dt, socfpga: Add Altera Arria10 L2 cache binding
  ...
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions
