From 01f59900d68b31a019c65f47e85235908be962ce9d4e67d825dc2988b752f7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 29 Apr 2025 17:39:46 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main kernel-firmware-intel revision
 2da6b58d28ac23e5bdc8cfc97b21c11e

---
 git_id                                |  2 +-
 kernel-firmware-intel-20250331.tar.xz |  3 ---
 kernel-firmware-intel-20250419.tar.xz |  3 +++
 kernel-firmware-intel.changes         | 15 +++++++++++++++
 kernel-firmware-intel.spec            |  9 ++++-----
 kernel-firmware-tools-20250325.tar.gz |  3 ---
 kernel-firmware-tools-20250425.tar.gz |  3 +++
 7 files changed, 26 insertions(+), 12 deletions(-)
 delete mode 100644 kernel-firmware-intel-20250331.tar.xz
 create mode 100644 kernel-firmware-intel-20250419.tar.xz
 delete mode 100644 kernel-firmware-tools-20250325.tar.gz
 create mode 100644 kernel-firmware-tools-20250425.tar.gz

diff --git a/git_id b/git_id
index 1011e89..a391a62 100644
--- a/git_id
+++ b/git_id
@@ -1 +1 @@
-0f7fe1e739bfe0d67a42df6daed43f253030c928
+5aa42075d00c58da1596c22679879267d2505737
diff --git a/kernel-firmware-intel-20250331.tar.xz b/kernel-firmware-intel-20250331.tar.xz
deleted file mode 100644
index 29ffb98..0000000
--- a/kernel-firmware-intel-20250331.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c93d402814d152fd8258df0b1d198beadd26d180f6a7228f8e6e43b0ee0c5b20
-size 5883272
diff --git a/kernel-firmware-intel-20250419.tar.xz b/kernel-firmware-intel-20250419.tar.xz
new file mode 100644
index 0000000..c986ead
--- /dev/null
+++ b/kernel-firmware-intel-20250419.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94cfb2ae5608beed42b2ecb214c31fa9dfa6313ebed355054a7bc0bce9508e61
+size 5879460
diff --git a/kernel-firmware-intel.changes b/kernel-firmware-intel.changes
index e5d0c69..8ee7230 100644
--- a/kernel-firmware-intel.changes
+++ b/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>
 
diff --git a/kernel-firmware-intel.spec b/kernel-firmware-intel.spec
index 100d2e8..301fb58 100644
--- a/kernel-firmware-intel.spec
+++ b/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*)
diff --git a/kernel-firmware-tools-20250325.tar.gz b/kernel-firmware-tools-20250325.tar.gz
deleted file mode 100644
index 7d20285..0000000
--- a/kernel-firmware-tools-20250325.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8e3b3646ce25e3d99c8394ed7deeabb5fe5907fb0645f7e90cceeb1c2136c0f
-size 16535
diff --git a/kernel-firmware-tools-20250425.tar.gz b/kernel-firmware-tools-20250425.tar.gz
new file mode 100644
index 0000000..a45f059
--- /dev/null
+++ b/kernel-firmware-tools-20250425.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7364202554baf494a3a469b17646832374b3651358c255627f99c4ec4a4338b6
+size 16848