From 5ca7faac47f99b864377a7ccf8f09a34a1658833 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 25 Sep 2025 10:46:56 -0400 Subject: [PATCH] Drop firewire-core-fix-overlooked-update-of-subsystem-abi.patch from older trees Signed-off-by: Sasha Levin --- ...x-overlooked-update-of-subsystem-abi.patch | 39 ------------------- queue-5.10/series | 1 - ...x-overlooked-update-of-subsystem-abi.patch | 39 ------------------- queue-5.15/series | 1 - ...x-overlooked-update-of-subsystem-abi.patch | 39 ------------------- queue-5.4/series | 1 - ...x-overlooked-update-of-subsystem-abi.patch | 39 ------------------- queue-6.1/series | 1 - 8 files changed, 160 deletions(-) delete mode 100644 queue-5.10/firewire-core-fix-overlooked-update-of-subsystem-abi.patch delete mode 100644 queue-5.15/firewire-core-fix-overlooked-update-of-subsystem-abi.patch delete mode 100644 queue-5.4/firewire-core-fix-overlooked-update-of-subsystem-abi.patch delete mode 100644 queue-6.1/firewire-core-fix-overlooked-update-of-subsystem-abi.patch diff --git a/queue-5.10/firewire-core-fix-overlooked-update-of-subsystem-abi.patch b/queue-5.10/firewire-core-fix-overlooked-update-of-subsystem-abi.patch deleted file mode 100644 index 6c5c683a83..0000000000 --- a/queue-5.10/firewire-core-fix-overlooked-update-of-subsystem-abi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8c5093e9e68a59ea8a60ff2fc602fad3ec5b50a0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 20 Sep 2025 11:51:48 +0900 -Subject: firewire: core: fix overlooked update of subsystem ABI version - -From: Takashi Sakamoto - -[ Upstream commit 853a57ba263adfecf4430b936d6862bc475b4bb5 ] - -In kernel v6.5, several functions were added to the cdev layer. This -required updating the default version of subsystem ABI up to 6, but -this requirement was overlooked. - -This commit updates the version accordingly. - -Fixes: 6add87e9764d ("firewire: cdev: add new version of ABI to notify time stamp at request/response subaction of transaction#") -Link: https://lore.kernel.org/r/20250920025148.163402-1-o-takashi@sakamocchi.jp -Signed-off-by: Takashi Sakamoto -Signed-off-by: Sasha Levin ---- - drivers/firewire/core-cdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c -index 16ea847ade5fd..3ca9d1c38fef8 100644 ---- a/drivers/firewire/core-cdev.c -+++ b/drivers/firewire/core-cdev.c -@@ -38,7 +38,7 @@ - /* - * ABI version history is documented in linux/firewire-cdev.h. - */ --#define FW_CDEV_KERNEL_VERSION 5 -+#define FW_CDEV_KERNEL_VERSION 6 - #define FW_CDEV_VERSION_EVENT_REQUEST2 4 - #define FW_CDEV_VERSION_ALLOCATE_REGION_END 4 - #define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW 5 --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 0add3a6fd8..8bf9204b9d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -81,7 +81,6 @@ net-rfkill-gpio-add-dt-support.patch net-rfkill-gpio-fix-crash-due-to-dereferencering-uninitialized-pointer.patch btrfs-tree-checker-fix-the-incorrect-inode-ref-size-check.patch mptcp-propagate-shutdown-to-subflows-when-possible.patch -firewire-core-fix-overlooked-update-of-subsystem-abi.patch alsa-usb-audio-fix-block-comments-in-mixer_quirks.patch alsa-usb-audio-drop-unnecessary-parentheses-in-mixer.patch alsa-usb-audio-avoid-multiple-assignments-in-mixer_q.patch diff --git a/queue-5.15/firewire-core-fix-overlooked-update-of-subsystem-abi.patch b/queue-5.15/firewire-core-fix-overlooked-update-of-subsystem-abi.patch deleted file mode 100644 index d2a11c378e..0000000000 --- a/queue-5.15/firewire-core-fix-overlooked-update-of-subsystem-abi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6df51ff6e19b1a32deb89eda387fc3d0e4dd6081 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 20 Sep 2025 11:51:48 +0900 -Subject: firewire: core: fix overlooked update of subsystem ABI version - -From: Takashi Sakamoto - -[ Upstream commit 853a57ba263adfecf4430b936d6862bc475b4bb5 ] - -In kernel v6.5, several functions were added to the cdev layer. This -required updating the default version of subsystem ABI up to 6, but -this requirement was overlooked. - -This commit updates the version accordingly. - -Fixes: 6add87e9764d ("firewire: cdev: add new version of ABI to notify time stamp at request/response subaction of transaction#") -Link: https://lore.kernel.org/r/20250920025148.163402-1-o-takashi@sakamocchi.jp -Signed-off-by: Takashi Sakamoto -Signed-off-by: Sasha Levin ---- - drivers/firewire/core-cdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c -index 16ea847ade5fd..3ca9d1c38fef8 100644 ---- a/drivers/firewire/core-cdev.c -+++ b/drivers/firewire/core-cdev.c -@@ -38,7 +38,7 @@ - /* - * ABI version history is documented in linux/firewire-cdev.h. - */ --#define FW_CDEV_KERNEL_VERSION 5 -+#define FW_CDEV_KERNEL_VERSION 6 - #define FW_CDEV_VERSION_EVENT_REQUEST2 4 - #define FW_CDEV_VERSION_ALLOCATE_REGION_END 4 - #define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW 5 --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index dfae519d23..dfd4c4dacc 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -100,7 +100,6 @@ ksmbd-smbdirect-validate-data_offset-and-data_length-field-of-smb_direct_data_tr mptcp-propagate-shutdown-to-subflows-when-possible.patch net-rfkill-gpio-add-dt-support.patch net-rfkill-gpio-fix-crash-due-to-dereferencering-uninitialized-pointer.patch -firewire-core-fix-overlooked-update-of-subsystem-abi.patch alsa-usb-audio-fix-block-comments-in-mixer_quirks.patch alsa-usb-audio-drop-unnecessary-parentheses-in-mixer.patch alsa-usb-audio-avoid-multiple-assignments-in-mixer_q.patch diff --git a/queue-5.4/firewire-core-fix-overlooked-update-of-subsystem-abi.patch b/queue-5.4/firewire-core-fix-overlooked-update-of-subsystem-abi.patch deleted file mode 100644 index 60d360028b..0000000000 --- a/queue-5.4/firewire-core-fix-overlooked-update-of-subsystem-abi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 401eb36971159200b5cb73c00f6412c54dfdcb1f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 20 Sep 2025 11:51:48 +0900 -Subject: firewire: core: fix overlooked update of subsystem ABI version - -From: Takashi Sakamoto - -[ Upstream commit 853a57ba263adfecf4430b936d6862bc475b4bb5 ] - -In kernel v6.5, several functions were added to the cdev layer. This -required updating the default version of subsystem ABI up to 6, but -this requirement was overlooked. - -This commit updates the version accordingly. - -Fixes: 6add87e9764d ("firewire: cdev: add new version of ABI to notify time stamp at request/response subaction of transaction#") -Link: https://lore.kernel.org/r/20250920025148.163402-1-o-takashi@sakamocchi.jp -Signed-off-by: Takashi Sakamoto -Signed-off-by: Sasha Levin ---- - drivers/firewire/core-cdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c -index 4fe36d549d615..f3f2c8fa8463f 100644 ---- a/drivers/firewire/core-cdev.c -+++ b/drivers/firewire/core-cdev.c -@@ -38,7 +38,7 @@ - /* - * ABI version history is documented in linux/firewire-cdev.h. - */ --#define FW_CDEV_KERNEL_VERSION 5 -+#define FW_CDEV_KERNEL_VERSION 6 - #define FW_CDEV_VERSION_EVENT_REQUEST2 4 - #define FW_CDEV_VERSION_ALLOCATE_REGION_END 4 - #define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW 5 --- -2.51.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 4d5187b09c..80d96f2e09 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -52,7 +52,6 @@ serial-sc16is7xx-fix-bug-in-flow-control-levels-init.patch net-rfkill-gpio-add-dt-support.patch net-rfkill-gpio-fix-crash-due-to-dereferencering-uninitialized-pointer.patch kvm-svm-sync-tpr-from-lapic-into-vmcb-v_tpr-even-if-avic-is-active.patch -firewire-core-fix-overlooked-update-of-subsystem-abi.patch alsa-usb-audio-fix-block-comments-in-mixer_quirks.patch alsa-usb-audio-avoid-multiple-assignments-in-mixer_q.patch alsa-usb-audio-simplify-null-comparison-in-mixer_qui.patch diff --git a/queue-6.1/firewire-core-fix-overlooked-update-of-subsystem-abi.patch b/queue-6.1/firewire-core-fix-overlooked-update-of-subsystem-abi.patch deleted file mode 100644 index cd501a6612..0000000000 --- a/queue-6.1/firewire-core-fix-overlooked-update-of-subsystem-abi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bbb4ab1d7b1ad7fff7a85aa9144d0edc5a70bacc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 20 Sep 2025 11:51:48 +0900 -Subject: firewire: core: fix overlooked update of subsystem ABI version - -From: Takashi Sakamoto - -[ Upstream commit 853a57ba263adfecf4430b936d6862bc475b4bb5 ] - -In kernel v6.5, several functions were added to the cdev layer. This -required updating the default version of subsystem ABI up to 6, but -this requirement was overlooked. - -This commit updates the version accordingly. - -Fixes: 6add87e9764d ("firewire: cdev: add new version of ABI to notify time stamp at request/response subaction of transaction#") -Link: https://lore.kernel.org/r/20250920025148.163402-1-o-takashi@sakamocchi.jp -Signed-off-by: Takashi Sakamoto -Signed-off-by: Sasha Levin ---- - drivers/firewire/core-cdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c -index 958aa4662ccb0..5cb0059f57e6b 100644 ---- a/drivers/firewire/core-cdev.c -+++ b/drivers/firewire/core-cdev.c -@@ -39,7 +39,7 @@ - /* - * ABI version history is documented in linux/firewire-cdev.h. - */ --#define FW_CDEV_KERNEL_VERSION 5 -+#define FW_CDEV_KERNEL_VERSION 6 - #define FW_CDEV_VERSION_EVENT_REQUEST2 4 - #define FW_CDEV_VERSION_ALLOCATE_REGION_END 4 - #define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW 5 --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index a38e88d7b0..2e99d193ee 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1,4 +1,3 @@ -firewire-core-fix-overlooked-update-of-subsystem-abi.patch alsa-usb-audio-fix-block-comments-in-mixer_quirks.patch alsa-usb-audio-drop-unnecessary-parentheses-in-mixer.patch alsa-usb-audio-avoid-multiple-assignments-in-mixer_q.patch -- 2.47.3