From: Freedo <freedo@linux-libre.fsfla.org>
Date: Tue, 25 Jul 2023 07:52:32 +0000 (+0000)
Subject: GNU Linux-libre 6.4.6-gnu scripts
X-Git-Tag: scripts/v6.4.6-gnu^0
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=7d668c6fabaa85ed7cb31bddc61b6a147ff10999;p=releases.git

GNU Linux-libre 6.4.6-gnu scripts
---

diff --git a/deblob-6.4 b/deblob-6.4
index 812f3d5dfc6..04db4e276f3 100755
--- a/deblob-6.4
+++ b/deblob-6.4
@@ -643,6 +643,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 a556fdbba4f..d71c170013d 100755
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # deblob-check version 2023-06-12 r19329
+#        modified with 2023-07-24 r19347
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6942,6 +6943,9 @@ set_except () {
     accept '[\t][\t][\t]tools[/]testing[/]selftests[/]rcutorture[/]bin[/]kvm\.sh[ ]--allcpus[ ]--duration[ ]5s[ ]--configs[ ]["]SRCU-P["][ ]--bootargs[ ]["]rcutorture\.test_srcu_lockdep=[$]val["][ ]--trust-make[ ]--datestamp[ ]["][$]ds[/][$]val["][ ]>[ ]["][$]T[/]kvm\.sh\.out["][ ]2>[&]1' tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh
     accept '[\t][\t][\t]mv[ ]["][$]T[/]kvm\.sh\.out["][ ]["][$]RCUTORTURE[/]res[/][$]ds[/][$]val["]' tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh
 
+    # 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)