From: Freedo <freedo@linux-libre.fsfla.org>
Date: Tue, 25 Jul 2023 07:41:38 +0000 (+0000)
Subject: GNU Linux-libre 5.15.122-gnu scripts
X-Git-Tag: scripts/v5.15.122-gnu
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=b3c225a9149c7054cc39cbdb1a4b05cd33087602;p=releases.git

GNU Linux-libre 5.15.122-gnu scripts
---

diff --git a/deblob-5.15 b/deblob-5.15
index fca1c708dfa..6ff362cf2cb 100755
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -646,6 +646,9 @@ s,\(timeout = \)\(firmware_loading_timeout()\),\1is_nonfree_firmware(name) ? 1 :
 announce MICROCODE_AMD - "AMD microcode patch loading support"
 reject_firmware arch/x86/kernel/cpu/microcode/amd.c
 clean_blob arch/x86/kernel/cpu/microcode/amd.c
+if grep -q -i zenbleed.*microcode arch/x86/kernel/cpu/amd.c; then
+  clean_blob arch/x86/kernel/cpu/amd.c
+fi
 clean_kconfig arch/x86/Kconfig MICROCODE_AMD
 clean_mk CONFIG_MICROCODE_AMD arch/x86/kernel/cpu/microcode/Makefile
 
diff --git a/deblob-check b/deblob-check
index 17a275e2927..6c8e426683e 100755
--- a/deblob-check
+++ b/deblob-check
@@ -22,6 +22,7 @@
 #        modified with 2023-05-17 r19267
 #        modified with 2023-06-09 r19312
 #        modified with 2021-12-20 r18515 (more partial)
+#        modified with 2023-07-24 r19347
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6401,6 +6402,9 @@ set_except () {
     # New in 5.15.121.
     blobname 'qcom[/]apq8016[/]\(\(mba\|modem\|wcnss\)\.mbn\|WCNSS_qcom_wlan_nv_sbc\.bin\)' arch/arm64/boot/dts/qcom/apq8016-sbc.dts
 
+    # New in 6.4.6, 6.1.41, 5.15.122, 5.10.187, 5.4.250, 4.19.289.
+    blobna 'please[ ]update[ ]your[ ]microcode' arch/x86/kernel/cpu/amd.c
+
     ;;
 
   */*freedo*.patch | */*logo*.patch)