From: Jason Self <j@jxself.org>
Date: Wed, 22 Apr 2020 15:30:02 +0000 (-0700)
Subject: deblob-5.6.6-gnu
X-Git-Tag: deblob-5.6.6-gnu^0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b33bd377b79bcdcb1f3ec33cc5d39e49e70914e7;p=librecmc%2Flinux-libre.git

deblob-5.6.6-gnu
---

diff --git a/deblob-5.6 b/deblob-5.6
index 3f9d399591c..dab44b013fe 100755
--- a/deblob-5.6
+++ b/deblob-5.6
@@ -50,6 +50,8 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=5.6 extra=
 
+# With r17398 for 5.6.6+.
+
 case $1 in
 --force)
   echo "WARNING: Using the force, ignored errors will be" >&2
@@ -867,6 +869,11 @@ clean_blob drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c
 clean_blob drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c
 clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c
 clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c
+if grep MODULE_FIRMWARE \
+	drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c > /dev/null; then
+  # Added in 5.6.6.
+  clean_blob drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c
+fi
 clean_blob drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c
 clean_blob drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm20b.c
 clean_blob drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c
diff --git a/deblob-check b/deblob-check
index 6b3f9d3a1b7..268fcd98437 100755
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2020-03-29
+# deblob-check version 2020-03-29 + 2020-04-22's r17437
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -5824,6 +5824,10 @@ set_except () {
     defsnc 'static[ ]const[ ]unsigned[ ]int[ ]\(voice_focus\|mic_svm\|equalizer\)_vals_lookup\[\][ ]=' sound/pci/hda/patch_ca0132.c
     defsnc 'static[ ]const[ ]struct[ ]hda_verb[ ]ca0132_init_verbs[01]\[\][ ]=' sound/pci/hda/patch_ca0132.c
 
+    # New variation in 5.6.6, 5.5.19, and 5.4.34.
+    # The firmware file name is supplied by the user.
+    accept '[\t]err[ ]=[ ]request_firmware_direct[(][&]fw[,][ ]file_name[,]\([^\n]*[\n]\+[^\n}]\)*err[ ]=[ ]mlx5_firmware_flash[(]' drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+
     ;;
 
   */*freedo*.patch | */*logo*.patch)