From 3e6be36badafcbde5c37a49fd872f201e81a4acd Mon Sep 17 00:00:00 2001 From: Freedo Date: Mon, 15 Jul 2024 12:06:15 +0000 Subject: [PATCH 1/1] GNU Linux-libre 6.10-gnua erratum notes (no logs) --- ERRATUM.txt | 13 ++++++++ scripts-6.10-gnu-6.10-gnua.patch | 43 +++++++++++++++++++++++++++ scripts-6.10-gnu-6.10-gnua.patch.sign | 6 ++++ sources-6.10-gnu-6.10-gnua.patch | 43 +++++++++++++++++++++++++++ sources-6.10-gnu-6.10-gnua.patch.sign | 6 ++++ 5 files changed, 111 insertions(+) create mode 100644 ERRATUM.txt create mode 100644 scripts-6.10-gnu-6.10-gnua.patch create mode 100644 scripts-6.10-gnu-6.10-gnua.patch.sign create mode 100644 sources-6.10-gnu-6.10-gnua.patch create mode 100644 sources-6.10-gnu-6.10-gnua.patch.sign diff --git a/ERRATUM.txt b/ERRATUM.txt new file mode 100644 index 00000000000..1292539ea34 --- /dev/null +++ b/ERRATUM.txt @@ -0,0 +1,13 @@ +This is an erratum, not a release proper, so the usual logs and +signatures are not here. + +Unlike releases, this hasn't gone through the release process, it's +just a record of the fix for an error introduced by a cleaning up bug. + +The scripts-* patch file holds the change to the cleaning-up scripts. +Applying it to the scripts used to create the release should get you +the corrected scripts, that have been tagged with the erratum identifier. + +The sources-* patch file holds the changes the scripts bring about to +the sources. Applying it to the sources of the release should get you +corrected sources, that have been tagged with the erratum identifier. diff --git a/scripts-6.10-gnu-6.10-gnua.patch b/scripts-6.10-gnu-6.10-gnua.patch new file mode 100644 index 00000000000..c617fc35dec --- /dev/null +++ b/scripts-6.10-gnu-6.10-gnua.patch @@ -0,0 +1,43 @@ +diff --git scripts/linux-libre-6.10-gnu/deblob-6.10 scripts/linux-libre-6.10-gnu/deblob-6.10 +index b8e39342b47a..ecdb90efcf58 100755 +--- scripts/linux-libre-6.10-gnu/deblob-6.10 ++++ scripts/linux-libre-6.10-gnu/deblob-6.10 +@@ -927,7 +927,11 @@ reject_firmware drivers/gpu/drm/i915/display/intel_dmc.c + clean_blob drivers/gpu/drm/i915/display/intel_dmc.c + reject_firmware drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c + clean_sed '/uc_fw->file_selected\.path = blob->path/ i\ +- 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\ +@@ -937,7 +941,11 @@ clean_sed '/uc_fw->file_selected\.path = blob->path/ i\ + + ' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 'disable non-Free firmware' + clean_sed '/Versionless file names must be unique/ 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)) + ' drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 'avoid validation fails' + clean_blob drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c + clean_blob drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h +@@ -3294,9 +3302,9 @@ announce SCSI_QLA_FC - "QLogic QLA2XXX Fibre Channel Support" + reject_firmware drivers/scsi/qla2xxx/qla_os.c + clean_sed ' + /^config SCSI_QLA_FC$/,/^config /{ +- /By default, firmware/i\ +- /*(DEBLOBBED)*/ +- /By default, firmware/,/linux-firmware tree/d ++ /^ By default, firmware/i\ ++ /*(DEBLOBBED)*/ ++ /^ By default, firmware/,/linux-firmware tree/d + }' drivers/scsi/qla2xxx/Kconfig 'removed firmware notes' + clean_blob drivers/scsi/qla2xxx/qla_os.c + clean_kconfig drivers/scsi/qla2xxx/Kconfig SCSI_QLA_FC diff --git a/scripts-6.10-gnu-6.10-gnua.patch.sign b/scripts-6.10-gnu-6.10-gnua.patch.sign new file mode 100644 index 00000000000..5130c054e44 --- /dev/null +++ b/scripts-6.10-gnu-6.10-gnua.patch.sign @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCZpUP7QAKCRC8t8+Hfn1H +p2ovAJ9V6bM87PNiGCs7m/4136hfsPyI2ACgg89X74hh7H4IkBzSQFmeUHJ3Esk= +=jPRl +-----END PGP SIGNATURE----- diff --git a/sources-6.10-gnu-6.10-gnua.patch b/sources-6.10-gnu-6.10-gnua.patch new file mode 100644 index 00000000000..10a7a9cddc6 --- /dev/null +++ b/sources-6.10-gnu-6.10-gnua.patch @@ -0,0 +1,43 @@ +diff --git linux-libre-6.10-gnu/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c linux-libre-6.10-gnu/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +index 275ebe8914a8..092db601c9d5 100644 +--- linux-libre-6.10-gnu/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c ++++ linux-libre-6.10-gnu/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 linux-libre-6.10-gnu/drivers/scsi/qla2xxx/Kconfig linux-libre-6.10-gnu/drivers/scsi/qla2xxx/Kconfig +index f84a78389729..772125ab8877 100644 +--- linux-libre-6.10-gnu/drivers/scsi/qla2xxx/Kconfig ++++ linux-libre-6.10-gnu/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" diff --git a/sources-6.10-gnu-6.10-gnua.patch.sign b/sources-6.10-gnu-6.10-gnua.patch.sign new file mode 100644 index 00000000000..8ee2b730414 --- /dev/null +++ b/sources-6.10-gnu-6.10-gnua.patch.sign @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCZpUP7gAKCRC8t8+Hfn1H +pzoUAJ94Uv2bw58U9G1G6N3w2/FehjG+MwCfS4H0EfcxYqRSwUNEbX+sduUSjD8= +=SwJq +-----END PGP SIGNATURE----- -- 2.31.1