Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760330AbcLPLrt (ORCPT ); Fri, 16 Dec 2016 06:47:49 -0500 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:42373 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934685AbcLPLrG (ORCPT ); Fri, 16 Dec 2016 06:47:06 -0500 Date: Fri, 16 Dec 2016 09:46:44 -0200 From: Mauro Carvalho Chehab To: Linus Torvalds Cc: Andrew Morton , EDAC Mailing List , Linux Kernel Mailing List Subject: [GIT PULL for v4.10-rc1] edac updates Message-ID: <20161216094644.03df640b@vento.lan> Organization: Samsung X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5878 Lines: 120 Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac tags/edac/v4.10-1 It contains the conversion of the EDAC uAPI documentation to ReST and the addition of the EDAC kAPI documentation to the driver-api docs. It also splits the EDAC headers by their functions. Regards, Mauro The following changes since commit daf34710a9e8849e04867d206692dc42d6d22263: Merge tag 'edac_for_4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (2016-12-13 09:03:52 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac tags/edac/v4.10-1 for you to fetch changes up to 4838a0def07f5611347860b1fc0129c3fe77cc02: EDAC: Document HW_EVENT_ERR_DEFERRED type (2016-12-15 08:58:12 -0200) ---------------------------------------------------------------- edac updates for v4.10-rc1 ---------------------------------------------------------------- Mauro Carvalho Chehab (19): edac: edac_core.h: get rid of unused kobj_complete edac: edac_core.h: remove prototype for edac_pci_reset_delay_period() edac.txt: add a section explaining the dimmX and rankX directories edac.txt: convert EDAC documentation to ReST edac.txt: remove info that the Nehalem EDAC is experimental edac.txt: update information about newer Intel CPUs edac.txt: Improve documentation, adding RAS introduction docs-rst: admin-guide: add documentation for EDAC edac: move EDAC PCI definitions to drivers/edac/edac_pci.h edac: move EDAC device definitions to drivers/edac/edac_device.h edac: rename edac_core.h to edac_mc.h edac: move documentation from edac_device to edac_core.h edac: move documentation from edac_pci*.c to edac_pci.h edac: move documentation from edac_mc.c to edac_core.h driver-api: create an edac.rst file with EDAC documentation edac: adjust docs location at MAINTAINERS and 00-INDEX edac: fix kernel-doc tags at the drivers/edac_*.h edac: fix kenel-doc markups at edac.h edac.rst: move concepts dictionary from edac.h Yazen Ghannam (1): EDAC: Document HW_EVENT_ERR_DEFERRED type Documentation/00-INDEX | 2 - Documentation/admin-guide/index.rst | 1 + Documentation/admin-guide/ras.rst | 1190 +++++++++++++++++++++++++++ Documentation/driver-api/edac.rst | 178 ++++ Documentation/driver-api/index.rst | 1 + Documentation/edac.txt | 812 ------------------ MAINTAINERS | 3 +- drivers/edac/altera_edac.c | 1 - drivers/edac/amd64_edac.h | 2 +- drivers/edac/amd76x_edac.c | 2 +- drivers/edac/amd8111_edac.c | 1 - drivers/edac/amd8131_edac.c | 1 - drivers/edac/cell_edac.c | 2 +- drivers/edac/cpc925_edac.c | 1 - drivers/edac/e752x_edac.c | 2 +- drivers/edac/e7xxx_edac.c | 2 +- drivers/edac/edac_device.c | 79 +- drivers/edac/{edac_core.h => edac_device.h} | 309 ++----- drivers/edac/edac_device_sysfs.c | 4 +- drivers/edac/edac_mc.c | 84 +- drivers/edac/edac_mc.h | 245 ++++++ drivers/edac/edac_mc_sysfs.c | 2 +- drivers/edac/edac_module.c | 2 +- drivers/edac/edac_module.h | 4 +- drivers/edac/edac_pci.c | 84 +- drivers/edac/edac_pci.h | 271 ++++++ drivers/edac/edac_pci_sysfs.c | 13 +- drivers/edac/fsl_ddr_edac.c | 1 - drivers/edac/ghes_edac.c | 2 +- drivers/edac/highbank_l2_edac.c | 1 - drivers/edac/highbank_mc_edac.c | 1 - drivers/edac/i3000_edac.c | 2 +- drivers/edac/i3200_edac.c | 2 +- drivers/edac/i5000_edac.c | 2 +- drivers/edac/i5100_edac.c | 1 - drivers/edac/i5400_edac.c | 2 +- drivers/edac/i7300_edac.c | 2 +- drivers/edac/i7core_edac.c | 2 +- drivers/edac/i82443bxgx_edac.c | 2 +- drivers/edac/i82860_edac.c | 2 +- drivers/edac/i82875p_edac.c | 2 +- drivers/edac/i82975x_edac.c | 2 +- drivers/edac/ie31200_edac.c | 2 +- drivers/edac/layerscape_edac.c | 2 +- drivers/edac/mpc85xx_edac.c | 1 - drivers/edac/mv64x60_edac.c | 1 - drivers/edac/octeon_edac-l2c.c | 1 - drivers/edac/octeon_edac-lmc.c | 1 - drivers/edac/octeon_edac-pc.c | 1 - drivers/edac/octeon_edac-pci.c | 1 - drivers/edac/pasemi_edac.c | 2 +- drivers/edac/ppc4xx_edac.c | 2 +- drivers/edac/r82600_edac.c | 2 +- drivers/edac/sb_edac.c | 2 +- drivers/edac/skx_edac.c | 2 +- drivers/edac/synopsys_edac.c | 2 +- drivers/edac/tile_edac.c | 2 +- drivers/edac/x38_edac.c | 2 +- drivers/edac/xgene_edac.c | 1 - include/linux/edac.h | 154 +--- 60 files changed, 2027 insertions(+), 1478 deletions(-) create mode 100644 Documentation/admin-guide/ras.rst create mode 100644 Documentation/driver-api/edac.rst delete mode 100644 Documentation/edac.txt rename drivers/edac/{edac_core.h => edac_device.h} (52%) create mode 100644 drivers/edac/edac_mc.h create mode 100644 drivers/edac/edac_pci.h