Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1251530
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-firmware-intel?expand=0&rev=2

git_id

@@ -1 +1 @@
-bd3d8a8b1bb76e352ea8d60db8198f0b40ff9ac8
+a5fbfa20d1bd0f11d7f530ddee7385812da1f24e

kernel-firmware-intel-20250307.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a619951b2ec790ff00a2f2bb337bed7b2d163da486829c7c3187f6bce86e789
-size 5824148

kernel-firmware-intel.changes

@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Sat Jul 19 06:36:00 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250718 (git commit a5fbfa20d1bd):
+  * intel_vpu: Update NPU firmware
+
+-------------------------------------------------------------------
+Thu Jun  5 10:38:12 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250603 (git commit 3b75d677f898):
+  * Intel IPU7: Add firmware binary files
+
+-------------------------------------------------------------------
+Tue May 13 05:13:33 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250512 (git commit 9f8e520fd736):
+  * intel_vpu: Update NPU firmware
+
+-------------------------------------------------------------------
+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>
+
+- Update to version 20250331 (git commit 0f7fe1e739bf):
+  * intel_vpu: Update NPU firmware
+
+-------------------------------------------------------------------
+Wed Mar 12 08:28:13 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250311 (git commit b69d4b74c986):
+  * linux-firmware: add firmware for qat_420xx devices
+
 -------------------------------------------------------------------
 Sun Mar  9 09:08:49 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
@@ -5223,7 +5268,6 @@ Wed Nov 24 20:02:38 UTC 2010 - coolo@novell.com
 - update to 20101113 tarball for 2.6.36+ kernel
 
 -------------------------------------------------------------------
-
 Thu Jul  1 17:11:34 UTC 2010 - gregkh@suse.de
 
 - update to the 20100617 tarball, which has lots of updates that

kernel-firmware-intel.spec

@@ -20,18 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version bd3d8a8b1bb76e352ea8d60db8198f0b40ff9ac8
+%define git_version a5fbfa20d1bd0f11d7f530ddee7385812da1f24e
 
 Name:           kernel-firmware-intel
-Version:        20250307
+Version:        20250718
 Release:        0
 Summary:        Kernel firmware files for Intel-platform device drivers
-License:        GPL-2.0-only AND GPL-2.0-or-later AND SUSE-Firmware
+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
-# URL:          https://github.com/openSUSE/kernel-firmware-tools/
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250718.tar.gz#/kernel-firmware-tools-20250718.tar.gz
-Source1:        kernel-firmware-tools-20250309.tar.xz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -45,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 without may-perform-usrmerge)
-Conflicts:      filesystem < 84
 %endif
 Supplements:    modalias(acpi*:INTC1009%3A*)
 Supplements:    modalias(acpi*:INTC1058%3A*)
@@ -111,7 +109,8 @@ Supplements:    modalias(pci:v00008086d0000E445sv*sd*bc*sc*i*)
 This package contains kernel firmware files for Intel-platform device drivers.
 
 %prep
-%autosetup -a1 -p1
+%autosetup -p1
+tar xf %{S:1} --strip-components=1
 # strip down WHENCE for the topic
 scripts/strip-topic-whence.sh intel < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE

kernel-firmware-tools-20250309.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41ad45fabbcc30c0754f0ec44be94f3aad91bb84b2fb14c141845b5ff7297673
-size 14488