GNU Linux-libre 6.10-gnua erratum

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 275ebe8914a8fcb9044aa0c74988506bc7b8e48f..092db601c9d5b3ded194972ad83b6d51bb7876fa 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -318,7 +318,11 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
                        continue;
                }
 
-               else if (blob->path == NONFREE_FIRMWARE)
+               /* If the compiler unifies string literals, as expected,
+                  do not bother with strcmp.  */
+               else if ((char const *)NONFREE_FIRMWARE == (char const *)NONFREE_FIRMWARE
+                        ? blob->path == (char const *)NONFREE_FIRMWARE
+                        : !strcmp (blob->path, NONFREE_FIRMWARE))
                        /* Never select an entry we would refuse to load.
                           If we find nothing, loading is disabled but the card
                           initialization proceeds as if the user had disabled
@@ -361,7 +365,11 @@ static bool validate_fw_table_type(struct drm_i915_private *i915, enum intel_uc_
 
        /* make sure the list is ordered as expected */
        for (i = 1; i < fw_count; i++) {
-           if (fw_blobs[i].blob.path != NONFREE_FIRMWARE)
+               /* If the compiler unifies string literals, as expected,
+                  do not bother with strcmp.  */
+               if ((char const *)NONFREE_FIRMWARE == (char const *)NONFREE_FIRMWARE
+                   ? fw_blobs[i].blob.path != (char const *)NONFREE_FIRMWARE
+                   : strcmp (fw_blobs[i].blob.path, NONFREE_FIRMWARE))
                /* Versionless file names must be unique per platform: */
                for (j = i + 1; j < fw_count; j++) {
                        /* Same platform? */

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index f84a7838972922b67e468c1289714e80895020da..772125ab8877dcfd52f77e315e57e07004f404f2 100644 (file)
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -10,7 +10,7 @@ config SCSI_QLA_FC
          This qla2xxx driver supports all QLogic Fibre Channel
          PCI and PCIe host adapters.
 
-       /*(DEBLOBBED)*/
+         /*(DEBLOBBED)*/
 
 config TCM_QLA2XXX
        tristate "TCM_QLA2XXX fabric module for QLogic 24xx+ series target mode HBAs"