diff --git a/_servicedata b/_servicedata
index ba095f1..7acba03 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
- <param name="changesrevision">f48da6da55078e732fb870cee4e72762e774c603</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">389575a8a1773b857bd7176cc42143471226f982</param></service></servicedata>
\ No newline at end of file
diff --git a/aliases.list b/aliases.list
index ab8f2ab..d6ebbb0 100644
--- a/aliases.list
+++ b/aliases.list
@@ -24,6 +24,9 @@ advansys: pci:v000010CDd00002500sv*sd*bc*sc*i*
advansys: pci:v000010CDd00002700sv*sd*bc*sc*i*
ambassador: pci:v000010B6d00001001sv*sd*bc*sc*i*
ambassador: pci:v000010B6d00001002sv*sd*bc*sc*i*
+amd_pmf: acpi*:AMDI0100%3A*
+amd_pmf: acpi*:AMDI0102%3A*
+amd_pmf: acpi*:AMDI0103%3A*
amdgpu: pci:v00001002d*sv*sd*bc03sc00i00*
amdgpu: pci:v00001002d*sv*sd*bc03sc80i00*
amdgpu: pci:v00001002d*sv*sd*bc12sc00i00*
diff --git a/kernel-firmware-20230918.tar.xz b/kernel-firmware-20230918.tar.xz
deleted file mode 100644
index 1fbcddc..0000000
--- a/kernel-firmware-20230918.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a860ce20bc4c98983627ab6c4458973e6dfb25eea7601bcb7dc28bc299df2667
-size 306435080
diff --git a/kernel-firmware-20231006.tar.xz b/kernel-firmware-20231006.tar.xz
new file mode 100644
index 0000000..c6837e5
--- /dev/null
+++ b/kernel-firmware-20231006.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36bb702257f37c5912853bd376339285e4565cd9584a2b2835efd921ab2f29d0
+size 308333084
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index eb6a8cd..3994067 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Mon Oct 09 07:10:37 UTC 2023 - tiwai@suse.com
+
+- Update to version 20231006 (git commit 389575a8a177) (jsc#PED-6130, jsc#PED-6081):
+ * WHENCE: add symlink for BananaPi M64
+ * linux-firmware: Add firmware file for Intel Bluetooth AX211
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * linux-firmware: Update firmware file for Intel Bluetooth AX211
+ * linux-firmware: Update firmware file for Intel Bluetooth AX211
+ * linux-firmware: Update firmware file for Intel Bluetooth AX210
+ * linux-firmware: Update firmware file for Intel Bluetooth 9560
+ * linux-firmware: Update firmware file for Intel Bluetooth 9260
+ * Build debian and fedora images
+ * Add new Makefile target to build a deb and rpm package
+ * i915: Update MTL DMC to v2.17
+ * iwlwifi: add FWs for new GL and MA device types with multiple RF modules
+ * amd_pmf: Add initial PMF TA for Smart PC Solution Builder
+ * linux-firmware: Update FW files for MRVL PCIE 8997 chipsets
+ * rtl_bt: Update RTL8851B BT USB firmware to 0x048A_D230
+ * iwlwifi: add new FWs from core81-65 release
+ * iwlwifi: update cc/Qu/QuZ firmwares for core81-65 release
+- Drop fdupes to avoid missing files for split packages (bsc#1215464)
+- Add conflicts to each split subpk against uncompressed raw package;
+ the contents may conflict and the compressed files won't be effective
+ unless the raw files get removed
+- Update aliases
+
-------------------------------------------------------------------
Fri Sep 22 12:53:05 UTC 2023 - tiwai@suse.com
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index fe1b98b..e3180c9 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -21,11 +21,11 @@
%define _firmwaredir /lib/firmware
%endif
%define __ksyms_path ^%{_firmwaredir}
-%define version_unconverted 20230918
+%define version_unconverted 20231006
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
Name: kernel-firmware
-Version: 20230918
+Version: 20231006
Release: 0
Summary: Linux kernel firmware files
License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT
@@ -74,7 +74,6 @@ Source1101: uncompressed-post
Patch1: copy-file-ignore-README.patch
# for compatibility with SLE15-SP4 kernel (bsc#1209681)
Patch200: iwlwifi-WHENCE-fix.patch
-BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): %{_bindir}/mkdir
Requires(post): %{_bindir}/touch
@@ -114,6 +113,9 @@ Obsoletes: qlogic-firmware < %{version}
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
%endif
+%if "%{flavor}" == "uncompressed"
+Provides: kernel-firmware-uncompressed = %{version}
+%endif
%description
This package contains the raw uncompressed firmware files for Linux kernel
@@ -196,6 +198,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -519,6 +523,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -549,6 +555,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -568,6 +576,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -773,6 +783,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -827,6 +839,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -878,6 +892,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -958,6 +974,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1349,6 +1367,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1365,6 +1385,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1754,6 +1776,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -1788,6 +1812,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2734,6 +2760,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2753,6 +2781,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2795,6 +2825,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -2986,6 +3018,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3087,6 +3121,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3107,6 +3143,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3154,6 +3192,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3381,6 +3421,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3409,6 +3451,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -3529,10 +3573,15 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
%endif
+Supplements: modalias(acpi*:AMDI0100%3A*)
+Supplements: modalias(acpi*:AMDI0102%3A*)
+Supplements: modalias(acpi*:AMDI0103%3A*)
Supplements: modalias(acpi*:AMDI0C00%3A*)
Supplements: modalias(eisa:sABP7401*)
Supplements: modalias(eisa:sABP7501*)
@@ -4039,6 +4088,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -4055,6 +4106,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -4251,6 +4304,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -4327,6 +4382,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -5200,6 +5257,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -5964,6 +6023,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6138,6 +6199,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6209,6 +6272,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6227,6 +6292,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6277,6 +6344,8 @@ Requires(post): /usr/bin/mkdir /usr/bin/touch
Requires(postun):/usr/bin/mkdir /usr/bin/touch
Requires(post): dracut >= 049
Conflicts: kernel < 5.3
+Conflicts: kernel-firmware < %{version}
+Conflicts: kernel-firmware-uncompressed
%if 0%{?suse_version} >= 1550
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
@@ -6437,7 +6506,6 @@ sh ./copy-firmware.sh -v --xz %{buildroot}%{_firmwaredir}
sh %{_sourcedir}/make-files.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif
-%fdupes -s %{buildroot}
%if "%{flavor}" == "uncompressed"
%pre
diff --git a/kernel-firmware.spec.in b/kernel-firmware.spec.in
index af67860..ebf50ec 100644
--- a/kernel-firmware.spec.in
+++ b/kernel-firmware.spec.in
@@ -74,7 +74,6 @@ Source1101: uncompressed-post
Patch1: copy-file-ignore-README.patch
# for compatibility with SLE15-SP4 kernel (bsc#1209681)
Patch200: iwlwifi-WHENCE-fix.patch
-BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): %{_bindir}/mkdir
Requires(post): %{_bindir}/touch
@@ -88,6 +87,9 @@ BuildArch: noarch
# make sure we have post-usrmerge filesystem package on TW
Conflicts: filesystem < 84
%endif
+%if "%{flavor}" == "uncompressed"
+Provides: kernel-firmware-uncompressed = %{version}
+%endif
%description
This package contains the raw uncompressed firmware files for Linux kernel
@@ -170,7 +172,6 @@ sh ./copy-firmware.sh -v --xz %{buildroot}%{_firmwaredir}
sh %{_sourcedir}/make-files.sh -v %{_sourcedir}/topics.list %{buildroot} %{_firmwaredir} < WHENCE
sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%endif
-%fdupes -s %{buildroot}
%if "%{flavor}" == "uncompressed"
@@POST@@
diff --git a/makespec.sh b/makespec.sh
index 643f82c..ae6d05e 100644
--- a/makespec.sh
+++ b/makespec.sh
@@ -18,6 +18,8 @@ define_subpackage () {
echo "Requires(postun):/usr/bin/mkdir /usr/bin/touch"
echo "Requires(post): dracut >= 049"
echo "Conflicts: kernel < 5.3"
+ echo "Conflicts: kernel-firmware-uncompressed"
+ echo "Conflicts: kernel-firmware < %{version}"
echo "%if 0%{?suse_version} >= 1550"
echo "# make sure we have post-usrmerge filesystem package on TW"
echo "Conflicts: filesystem < 84"
diff --git a/topics.list b/topics.list
index bab3c61..9e7630d 100644
--- a/topics.list
+++ b/topics.list
@@ -73,6 +73,7 @@ mga: platform
r128: platform
radeon: radeon radeon amdgpu
amdgpu: amdgpu
+amd_pmf: platform
s2255drv: platform
rtl8192e: realtek r8192e_pci
lgs8gxx: media