Merge branch 'release/debian/3.7-1'HEADdebian/3.7-1master

1 files changed, 0 insertions, 32 deletions

diff --git a/debian/patches/0160-HPE_OEM_Firmware_change.patch b/debian/patches/0160-HPE_OEM_Firmware_change.patch
deleted file mode 100644
index 075b566..0000000
--- a/debian/patches/0160-HPE_OEM_Firmware_change.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: HPE OEM Record 237 Firmware change
-Origin: upstream, http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=80de376231e903d2cbea95e51ffea31860502159
-Forwarded: not-needed
-Last-Update: 2023-07-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/dmioem.c
-===================================================================
---- trunk.orig/dmioem.c
-+++ trunk/dmioem.c
-@@ -1094,7 +1094,8 @@ static int dmi_decode_hp(const struct dm
- 			 *  0x06  | Manufacture|STRING | DIMM Manufacturer
- 			 *  0x07  | Part Number|STRING | DIMM Manufacturer's Part Number
- 			 *  0x08  | Serial Num |STRING | DIMM Vendor Serial Number
--			 *  0x09  | Spare Part |STRING | DIMM Spare Part Number
-+			 *  0x09  | Man Date   | BYTE  | DIMM Manufacture Date (YEAR) in BCD
-+			 *  0x0A  | Man Date   | BYTE  | DIMM Manufacture Date (WEEK) in BCD
- 			 */
- 			if (gen < G9) return 0;
- 			pr_handle_name("%s DIMM Vendor Information", company);
-@@ -1105,8 +1106,9 @@ static int dmi_decode_hp(const struct dm
- 			pr_attr("DIMM Manufacturer Part Number", "%s", dmi_string(h, data[0x07]));
- 			if (h->length < 0x09) break;
- 			pr_attr("DIMM Vendor Serial Number", "%s", dmi_string(h, data[0x08]));
--			if (h->length < 0x0A) break;
--			pr_attr("DIMM Spare Part Number", "%s", dmi_string(h, data[0x09]));
-+			if (h->length < 0x0B) break;
-+			if (WORD(data + 0x09))
-+				pr_attr("DIMM Manufacture Date", "20%02x-W%02x", data[0x09], data[0x0A]);
- 			break;
- 
- 		case 238: