!47 backport patches from upstream

From: @znzjugod 
Reviewed-by: @ziyangc 
Signed-off-by: @ziyangc

backport-mcelog-Change-DDR4-string-to-DDR-for-i10nm-platforms.patch

@@ -0,0 +1,39 @@
+From 41ad98a81cc2c1a85dfdbff16eafe153b99e7866 Mon Sep 17 00:00:00 2001
+From: Tony Luck <tony.luck@intel.com>
+Date: Fri, 3 Dec 2021 09:44:04 -0800
+Subject: [PATCH] mcelog: Change "DDR4" string to "DDR" for i10nm platforms
+
+There are i10nm platforms that support DDR5 as well as some that support
+DDR4.
+
+Change the DDR4 string to DDR to avoid confusion.
+
+Signed-off-by: Tony Luck <tony.luck@intel.com>
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+---
+ i10nm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/i10nm.c b/i10nm.c
+index b629c27..3a0e97c 100644
+--- a/i10nm.c
++++ b/i10nm.c
+@@ -191,7 +191,7 @@ static char *imc_1[] = {
+ };
+ 
+ static char *imc_2[] = {
+-	[0x00] = "DDR4 command / address parity error",
++	[0x00] = "DDR command / address parity error",
+ 	[0x20] = "HBM command / address parity error",
+ 	[0x21] = "HBM data parity error",
+ };
+@@ -204,7 +204,7 @@ static char *imc_8[] = {
+ 	[0x00] = "DDR-T bad request",
+ 	[0x01] = "DDR Data response to an invalid entry",
+ 	[0x02] = "DDR data response to an entry not expecting data",
+-	[0x03] = "DDR4 completion to an invalid entry",
++	[0x03] = "DDR completion to an invalid entry",
+ 	[0x04] = "DDR-T completion to an invalid entry",
+ 	[0x05] = "DDR data/completion FIFO overflow",
+ 	[0x06] = "DDR-T ERID correctable parity error",
+

mcelog.spec

@@ -5,7 +5,7 @@
 
 Name:	mcelog
 Version:	168
-Release:	5
+Release:	6
 Epoch:		3
 Summary:	Linux kernel machine check handling middleware
 License:	GPLv2
@@ -18,6 +18,7 @@ Source3:	mcelog.conf
 Patch0:backport-mcelog-Handle-sysfs-files-without-length.patch
 Patch1:backport-fix-the-buf-not-freed-in-read_field.patch
 Patch2:backport-fix-warnings-in-sysfs.patch
+Patch3:backport-mcelog-Change-DDR4-string-to-DDR-for-i10nm-platforms.patch
 
 ExclusiveArch:  i686 x86_64
 BuildRequires:	bison flex systemd gcc psmisc
@@ -40,6 +41,7 @@ driver error recovery handler and PCIE AER core handler.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS  -Wl,-z,relro,-z,now -fpie" LDFLAGS="-Wl,-z,relro,-z,now -fpie -pie"
@@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Mon Aug 21 2023 zhangnan <zhangnan134@huawei.com> - 3:168-6
+- backport patches from upstream:change the DDR4 string to DDR to avoid confusion 
+
 * Fri Jun 16 2023 zhangruifang2020 <zhangruifang1@h-partners.com> - 3:168-5
 - backport patches from upstream