From: Freedo <freedo@linux-libre.fsfla.org>
Date: Tue, 25 Jul 2023 07:49:03 +0000 (+0000)
Subject: GNU Linux-libre 6.1.41-gnu scripts
X-Git-Tag: scripts/v6.1.41-gnu
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=84c381ac17af2c39f816cade82b0da810a344d59;p=releases.git

GNU Linux-libre 6.1.41-gnu scripts
---

diff --git a/deblob-6.1 b/deblob-6.1
index 244eac3a4bb..39348e11069 100755
--- a/deblob-6.1
+++ b/deblob-6.1
@@ -645,6 +645,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 e9cb168a316..a2e68623d6f 100755
--- a/deblob-check
+++ b/deblob-check
@@ -8,6 +8,7 @@
 #        modified with 2023-05-17 r19267
 #        modified with 2023-05-24 r19297
 #        modified with 2023-06-09 r19312
+#        modified with 2023-07-24 r19347
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6713,6 +6714,9 @@ set_except () {
     # New in 6.3.7, 6.1.33, 5.15.115, 5.10.183, 5.4.246.
     accept '[\t][\t]req->name[ ]=[ ]test_fw_config->name[;][\n][\t][\t]req->fw_buf[ ]=[ ]NULL[;][\n][\t][\t]req->fw[ ]=[ ]NULL[;][\n][\t][\t]req->idx[ ]=[ ]i[;][\n][\t][\t]init_completion[(][&]req->completion[)][;][\n][\t][\t]rc[ ]=[ ]request_firmware_nowait[(]THIS_MODULE[,][ ]\([^);, \t\n]*[,][ \t\n]*\)*trigger_batched_cb[)][;]' lib/test_firmware.c
 
+    # 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)