diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2025-09-26 11:44:35 +0200 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2025-09-26 11:44:35 +0200 |
| commit | 69ed025aeb4c8faa3019e5997b850a554b47498c (patch) | |
| tree | e7f10d10063902c619b21604844de927580bc139 | |
| parent | c2fcb2e79d6f4113e93aabc50158bc97a359d1f5 (diff) | |
| parent | 71965cae7db394ff5ba3b2d2befe4e136ceec268 (diff) | |
| download | linux-69ed025aeb4c8faa3019e5997b850a554b47498c.tar.gz linux-69ed025aeb4c8faa3019e5997b850a554b47498c.zip | |
Merge branches 'edac-drivers' and 'edac-misc' into edac-updates
* edac-drivers:
EDAC/versalnet: Return the correct error in mc_probe()
EDAC/mc_sysfs: Increase legacy channel support to 16
EDAC/amd64: Add support for AMD family 1Ah-based newer models
EDAC: Add a driver for the AMD Versal NET DDR controller
dt-bindings: memory-controllers: Add support for Versal NET EDAC
RAS: Export log_non_standard_event() to drivers
cdx: Export Symbols for MCDI RPC and Initialization
cdx: Split mcdi.h and reorganize headers
EDAC/skx_common: Use topology_physical_package_id() instead of open coding
EDAC/altera: Use dev_fwnode()
EDAC/skx_common: Remove unused *NUM*_IMC macros
EDAC/i10nm: Reallocate skx_dev list if preconfigured cnt != runtime cnt
EDAC/skx_common: Remove redundant upper bound check for res->imc
EDAC/skx_common: Make skx_dev->imc[] a flexible array
EDAC/skx_common: Swap memory controller index mapping
EDAC/skx_common: Move mc_mapping to be a field inside struct skx_imc
EDAC/{skx_common,skx}: Use configuration data, not global macros
EDAC/i10nm: Skip DIMM enumeration on a disabled memory controller
EDAC/ie31200: Add two more Intel Alder Lake-S SoCs for EDAC support
dt-bindings: arm: cpus: Add edac-enabled property
EDAC: Add EDAC driver for ARM Cortex A72 cores
* edac-misc:
EDAC: Fix wrong executable file modes for C source files
MAINTAINERS: EDAC: Drop inactive reviewers
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/edac/ecs.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/edac/mem_repair.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/edac/scrub.c | 0 |
4 files changed, 0 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 23254e89a1f8..7a20c22a0877 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8726,9 +8726,6 @@ F: drivers/edac/thunderx_edac* EDAC-CORE M: Borislav Petkov <bp@alien8.de> M: Tony Luck <tony.luck@intel.com> -R: James Morse <james.morse@arm.com> -R: Mauro Carvalho Chehab <mchehab@kernel.org> -R: Robert Richter <rric@kernel.org> L: linux-edac@vger.kernel.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next diff --git a/drivers/edac/ecs.c b/drivers/edac/ecs.c index 51c451c7f0f0..51c451c7f0f0 100755..100644 --- a/drivers/edac/ecs.c +++ b/drivers/edac/ecs.c diff --git a/drivers/edac/mem_repair.c b/drivers/edac/mem_repair.c index 108d69209146..108d69209146 100755..100644 --- a/drivers/edac/mem_repair.c +++ b/drivers/edac/mem_repair.c diff --git a/drivers/edac/scrub.c b/drivers/edac/scrub.c index f9d02af2fc3a..f9d02af2fc3a 100755..100644 --- a/drivers/edac/scrub.c +++ b/drivers/edac/scrub.c |