Sync from SUSE:SLFO:Main kernel-firmware-intel revision 2da6b58d28ac23e5bdc8cfc97b21c11e

git_id

@@ -1 +1 @@
-0f7fe1e739bfe0d67a42df6daed43f253030c928
+5aa42075d00c58da1596c22679879267d2505737

kernel-firmware-intel.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Apr 25 13:52:22 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Change conflicts filesystem < 84 to conflicts filesystem without
+  may-perform-usrmerge. Version 84 is specific to Tumbleweed; CODE
+  16 uses Version 16; yet we need to ensure we get an up-to-date
+  version of filesystem. Relying on the recently introduced provides
+  instructing zypp about the usrmerge is perfect for this use case.
+
+-------------------------------------------------------------------
+Sun Apr 20 07:58:14 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250419 (git commit 5aa42075d00c):
+  * intel: ish: Update license file for ISH
+
 -------------------------------------------------------------------
 Tue Apr  1 08:32:02 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 

kernel-firmware-intel.spec

@@ -20,17 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version 0f7fe1e739bfe0d67a42df6daed43f253030c928
+%define git_version 5aa42075d00c58da1596c22679879267d2505737
 
 Name:           kernel-firmware-intel
-Version:        20250331
+Version:        20250419
 Release:        0
 Summary:        Kernel firmware files for Intel-platform device drivers
 License:        GPL-2.0-or-later AND SUSE-Firmware AND GPL-2.0-only
 Group:          System/Kernel
 URL:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 Source0:        %{name}-%{version}.tar.xz
-Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250325.tar.gz#/kernel-firmware-tools-20250325.tar.gz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250425.tar.gz#/kernel-firmware-tools-20250425.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -44,8 +44,7 @@ Conflicts:      kernel < 5.3
 Conflicts:      kernel-firmware-uncompressed
 BuildArch:      noarch
 %if 0%{?suse_version} >= 1550
-# make sure we have post-usrmerge filesystem package on TW
-Conflicts:      filesystem < 84
+Conflicts:      (filesystem without may-perform-usrmerge)
 %endif
 Supplements:    modalias(acpi*:INTC1009%3A*)
 Supplements:    modalias(acpi*:INTC1058%3A*)