github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-23 15:32:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge remote-tracking branches 'ras/edac-drivers' and 'ras/edac-misc' into edac-updates

Browse Source 
* ras/edac-drivers:
  MAINTAINERS: Orphan drivers/edac/i3200_edac.c
  EDAC/skx_base: Fix ambiguous bitwise and logical operator style
  EDAC/i10nm: Fix mdev reference leak in i10nm_get_ddr_munits()
  MAINTAINERS: Orphan drivers/edac/xgene_edac.c
  MAINTAINERS: Orphan drivers/edac/x38_edac.c
  MAINTAINERS: Orphan drivers/edac/i82975x_edac.c
  EDAC/dummy: Add a dummy EDAC driver
  EDAC/ie31200: Disable PCI device when probing fails
  EDAC/intel-bff: Report frequent filter overflows
  EDAC/intel-bff: Compute unique ID for overflowed filter
  EDAC/intel-bff: Reset bitfix filter when it overflows
  EDAC/intel-bff: Add Diamond Rapids support
  EDAC/intel-bff: Add stub Intel bitfix filter driver
  x86/mce: Add enumeration for Intel bitfix filter reset
  cacheinfo: Export get_cpu_cacheinfo_id() for loadable modules
  EDAC/i10nm: Fix Granite Rapids ADXL MC mapping

* ras/edac-misc:
  EDAC/{bluefield,loongson}: Use named initializers for acpi_device_id
  MAINTAINERS: Update Qiuxu Zhuo's email address

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
This commit is contained in:
Borislav Petkov (AMD) 2026-10-18 12:01:02 -07:00
commit 5dbc181a22
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -9488,7 +9488,7 @@ F: drivers/edac/ie31200_edac.c
EDAC-IGEN6
M: Tony Luck <tony.luck@intel.com>
R: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
R: Qiuxu Zhuo <qzhuo@nvidia.com>
L: linux-edac@vger.kernel.org
S: Maintained
F: drivers/edac/igen6_edac.c
@ -9533,7 +9533,7 @@ F: drivers/edac/qcom_edac.c
EDAC-SBRIDGE
M: Tony Luck <tony.luck@intel.com>
R: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
R: Qiuxu Zhuo <qzhuo@nvidia.com>
L: linux-edac@vger.kernel.org
S: Maintained
F: drivers/edac/sb_edac.c

4
drivers/edac/bluefield_edac.c
View File

@ -472,8 +472,8 @@ static void bluefield_edac_mc_remove(struct platform_device *pdev)
}
static const struct acpi_device_id bluefield_mc_acpi_ids[] = {
{"MLNXBF08", 0},
{}
{ .id = "MLNXBF08" },
{ }
};
MODULE_DEVICE_TABLE(acpi, bluefield_mc_acpi_ids);

4
drivers/edac/loongson_edac.c
View File

@ -137,8 +137,8 @@ static void edac_remove(struct platform_device *pdev)
}
static const struct acpi_device_id loongson_edac_acpi_match[] = {
{"LOON0010", 0},
{}
{ .id = "LOON0010" },
{ }
};
MODULE_DEVICE_TABLE(acpi, loongson_edac_acpi_match);