From a1e96c39148e928433d318710d38e6fac22fd368 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: Aug 17 2023 13:05:12 +0000
Subject: kernel-6.5.0-0.rc6.20230817git4853c74bd7ab.46


* Thu Aug 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.46.el130]
- all: properly cleanup firewire once and for all (Peter Robinson)
- Fix up filters for Fedora (Justin M. Forbes)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

---

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 939753a..6645cf3 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 45
+RHEL_RELEASE = 46
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index 6be276a..f32b7ab 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -2407,12 +2407,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -7259,10 +7254,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index c7fafcc..afbb7d4 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -2390,12 +2390,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -7232,10 +7227,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 0127668..458cb0d 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -1919,12 +1919,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5842,10 +5837,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 8c0237c..94072c0 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -1903,12 +1903,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5819,10 +5814,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 5df49cd..8390bfa 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2407,12 +2407,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -7259,10 +7254,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 917f148..6e2a6d3 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1916,12 +1916,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5838,10 +5833,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 65c6846..99b2710 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2390,12 +2390,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -7232,10 +7227,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index ff08ea9..4e37a18 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1900,12 +1900,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5815,10 +5810,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index f18322b..66729a9 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -1995,12 +1995,7 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIXED_PHY=y
@@ -5980,10 +5975,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index c302317..8110426 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -1979,12 +1979,7 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIXED_PHY=y
@@ -5957,10 +5952,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 5369596..c138487 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1888,13 +1888,8 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -6009,10 +6004,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 5210af8..f172609 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1685,12 +1685,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5429,10 +5424,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 36d918c..1998ac6 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1869,13 +1869,8 @@ CONFIG_FHANDLE=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -5980,10 +5975,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index c903a2d..8208165 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1669,12 +1669,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5408,10 +5403,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index ae8734a..6e3d75a 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1895,12 +1895,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -5948,10 +5943,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index eb7d426..001665d 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1691,12 +1691,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5407,10 +5402,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 2627e9e..ab7c3b1 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1876,12 +1876,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 # CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -5919,10 +5914,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 CONFIG_SND_FM801_TEA575X_BOOL=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 645aac3..852db6a 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1675,12 +1675,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5386,10 +5381,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 712cd2f..197c7c5 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1680,12 +1680,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5405,10 +5400,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 7b2cb89..7b22c07 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1798,12 +1798,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5645,10 +5640,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index ddd4941..643bd2a 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1782,12 +1782,7 @@ CONFIG_FHANDLE=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
@@ -5623,10 +5618,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 522c4eb..a375297 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -1880,12 +1880,7 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIXED_PHY=y
@@ -5789,10 +5784,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index e38a019..dc269e2 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -1864,12 +1864,7 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_FIPS_SIGNATURE_SELFTEST=y
 # CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_KUNIT_UAPI_TEST is not set
-CONFIG_FIREWIRE_NET=m
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_SERIAL=m
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIXED_PHY=y
@@ -5767,10 +5762,6 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREFACE=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_MOTU=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
diff --git a/kernel.spec b/kernel.spec
index a1ba5cb..d57ffb4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -162,13 +162,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.5.0
 %define specversion 6.5.0
 %define patchversion 6.5
-%define pkgrelease 0.rc6.20230816git4853c74bd7ab.45
+%define pkgrelease 0.rc6.20230817git4853c74bd7ab.46
 %define kversion 6
 %define tarfile_release 6.5-rc6-36-g4853c74bd7ab
 # This is needed to do merge window version magic
 %define patchlevel 5
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20230816git4853c74bd7ab.45%{?buildid}%{?dist}
+%define specrelease 0.rc6.20230817git4853c74bd7ab.46%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
@@ -3713,6 +3713,10 @@ fi\
 #
 #
 %changelog
+* Thu Aug 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.46.el130]
+- all: properly cleanup firewire once and for all (Peter Robinson)
+- Fix up filters for Fedora (Justin M. Forbes)
+
 * Wed Aug 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc6.4853c74bd7ab.45.el130]
 - New configs in arch/x86 (Fedora Kernel Team)
 - Add an armv7 directory back for the Fedora configs (Justin M. Forbes)
diff --git a/sources b/sources
index de5e1d0..1d80654 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-6.5-rc6-36-g4853c74bd7ab.tar.xz) = aba78052b7a25353b6f45cee1e46f1d0b58c9c756ab14d92b40a91d3a3778ba5169e846865a35e6d02da7c62ecdacdf66ca5d271df1c793f6a2c2b5d0d6fe337
-SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 828e8ec17ae8d4ee4787f8cf6487ca2b8703a7c6e37f599a74021b713f8721df7288b4c6ad553cfcaedc86140176ad5f57903836cf56c7e1265e9058652e10e9
-SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 6d1deb5331e632a2fcf601dd70c4e4f71e13cc2196ff819e3d7ea595c6dafba02c6ff4460c29696341d48f84840ab148dd3fb06666eb1ceca8b755fe0aa621e7
+SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 0133a20f73d0f8ba732dca8e425ee51aea914264745be4f4a546ef6b7df1aba5e804b5b68266b813958526980987a06fcd14d1f19fed4b8ab1c40ca80e46f3b4
+SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 85973e96cb1d14bb85befd6e6727d5c378fbfe72efc4008f3e39e7852f11cd48e66d56f410257b95a6315dc705d652bf8a92240e73da72ade60d1f9798a88fa5