Merge branch 'devel'

* devel: (33 commits)
  edac i5000, i5400: fix pointer math in i5000_get_mc_regs()
  edac: allow specifying the error count with fake_inject
  edac: add support for Calxeda highbank L2 cache ecc
  edac: add support for Calxeda highbank memory controller
  edac: create top-level debugfs directory
  sb_edac: properly handle error count
  i7core_edac: properly handle error count
  edac: edac_mc_handle_error(): add an error_count parameter
  edac: remove arch-specific parameter for the error handler
  amd64_edac: Don't pass driver name as an error parameter
  edac_mc: check for allocation failure in edac_mc_alloc()
  edac: Increase version to 3.0.0
  edac_mc: Cleanup per-dimm_info debug messages
  edac: Convert debugfX to edac_dbg(X,
  edac: Use more normal debugging macro style
  edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs
  Edac: Add ABI Documentation for the new device nodes
  edac: move documentation ABI to ABI/testing/sysfs-devices-edac
  i7core_edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  ...

1 files changed, 8 insertions, 104 deletions

diff --git a/Documentation/edac.txt b/Documentation/edac.txt
index 03df2b020332..56c7e936430f 100644
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
@@ -232,116 +232,20 @@ EDAC control and attribute files.
 
 
 In 'mcX' directories are EDAC control and attribute files for
-this 'X' instance of the memory controllers:
-
-
-Counter reset control file:
-
-        'reset_counters'
-
-        This write-only control file will zero all the statistical counters
-        for UE and CE errors.  Zeroing the counters will also reset the timer
-        indicating how long since the last counter zero.  This is useful
-        for computing errors/time.  Since the counters are always reset at
-        driver initialization time, no module/kernel parameter is available.
-
-        RUN TIME: echo "anything" >/sys/devices/system/edac/mc/mc0/counter_reset
-
-                This resets the counters on memory controller 0
-
-
-Seconds since last counter reset control file:
-
-        'seconds_since_reset'
-
-        This attribute file displays how many seconds have elapsed since the
-        last counter reset. This can be used with the error counters to
-        measure error rates.
-
-
-
-Memory Controller name attribute file:
-
-        'mc_name'
-
-        This attribute file displays the type of memory controller
-        that is being utilized.
-
-
-Total memory managed by this memory controller attribute file:
-
-        'size_mb'
-
-        This attribute file displays, in count of megabytes, of memory
-        that this instance of memory controller manages.
-
-
-Total Uncorrectable Errors count attribute file:
-
-        'ue_count'
-
-        This attribute file displays the total count of uncorrectable
-        errors that have occurred on this memory controller. If panic_on_ue
-        is set this counter will not have a chance to increment,
-        since EDAC will panic the system.
-
-
-Total UE count that had no information attribute fileY:
-
-        'ue_noinfo_count'
-
-        This attribute file displays the number of UEs that have occurred
-        with no information as to which DIMM slot is having errors.
-
-
-Total Correctable Errors count attribute file:
-
-        'ce_count'
-
-        This attribute file displays the total count of correctable
-        errors that have occurred on this memory controller. This
-        count is very important to examine. CEs provide early
-        indications that a DIMM is beginning to fail. This count
-        field should be monitored for non-zero values and report
-        such information to the system administrator.
-
-
-Total Correctable Errors count attribute file:
-
-        'ce_noinfo_count'
-
-        This attribute file displays the number of CEs that
-        have occurred wherewith no information as to which DIMM slot
-        is having errors. Memory is handicapped, but operational,
-        yet no information is available to indicate which slot
-        the failing memory is in. This count field should be also
-        be monitored for non-zero values.
-
-Device Symlink:
-
-        'device'
-
-        Symlink to the memory controller device.
-
-Sdram memory scrubbing rate:
-
-        'sdram_scrub_rate'
-
-        Read/Write attribute file that controls memory scrubbing. The scrubbing
-        rate is set by writing a minimum bandwidth in bytes/sec to the attribute
-        file. The rate will be translated to an internal value that gives at
-        least the specified rate.
-
-        Reading the file will return the actual scrubbing rate employed.
-
-        If configuration fails or memory scrubbing is not implemented, accessing
-        that attribute will fail.
+this 'X' instance of the memory controllers.
 
+For a description of the sysfs API, please see:
+        Documentation/ABI/testing/sysfs/devices-edac
 
 
 ============================================================================
 'csrowX' DIRECTORIES
 
+When CONFIG_EDAC_LEGACY_SYSFS is enabled, the sysfs will contain the
+csrowX directories. As this API doesn't work properly for Rambus, FB-DIMMs
+and modern Intel Memory Controllers, this is being deprecated in favor
+of dimmX directories.
+
 In the 'csrowX' directories are EDAC control and attribute files for
 this 'X' instance of csrow: