Accepting request 724951 from home:tiwai:branches:Kernel:HEAD

- Update to version 20190815 (git-commit 07b925b450bf): * Install only listed firmware files * rtw88: add a README file * rtw88: RTL8822C: add WoW firmware v7.3 * rtw88: RTL8822C: update rtw8822c_fw.bin to v7.3 * ath10k: QCA9984 hw1.0: update board-2.bin * ath10k: QCA9984 hw1.0: update firmware-5.bin to 10.4-3.9.0.2-00046 * ath10k: QCA988X hw2.0: update firmware-5.bin to 10.2.4-1.0-00045 * ath10k: QCA9888 hw2.0: update board-2.bin * ath10k: QCA9888 hw2.0: update firmware-5.bin to 10.4-3.9.0.2-00040 * ath10k: QCA9887 hw1.0: update firmware-5.bin to 10.2.4-1.0-00045 * ath10k: QCA6174 hw3.0: update firmware-6.bin to WLAN.RM.4.4.1-00140-QCARMSWPZ-1 * ath10k: QCA4019 hw1.0: update board-2.bin * cxgb4: update firmware to revision 1.24.3.0 * nfp: update Agilio SmartNIC flower firmware to rev AOTC-2.10.A.38 * nvidia: add missing entries in WHENCE * linux-firmware: Update NXP Management Complex firmware to version 10.16.2 * iwlwifi: update -48 FWs for Qu and cc * iwlwifi: update FWs for 3168, 7265D, 9000, 9260, 8000, 8265 and cc * drm/i915/firmware: Add v33 of GuC for ICL * drm/i915/firmware: Add v33 of GuC for KBL * drm/i915/firmware: Add v33 of GuC for SKL * drm/i915/firmware: Add v33 of GuC for GLK * drm/i915/firmware: Add v33 of GuC for BXT - Drop iwlwifi revert patch, as the fix will go into 5.2.x kernel (bsc#1142128): WHENCE-iwlwifi-9xxx-46-revert.patch - Drop the deprecated upstream fix: 0001-nvidia-add-missing-entries-in-WHENCE.patch - Drop the local copy of copy-file.sh that is already included in OBS-URL: https://build.opensuse.org/request/show/724951 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=269
2019-08-21 07:50:46 +00:00 · 2019-08-21 07:50:46 +00:00 · a2bfe969aa
commit a2bfe969aa
parent 9056814004
16 changed files with 139 additions and 159 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -23,8 +23,6 @@
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
 ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text
-iwlwifi-9000-pu-b0-jf-b0-46.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-9260-th-b0-jf-b0-46.ucode filter=lfs diff=lfs merge=lfs -text
 ql2600_fw.bin filter=lfs diff=lfs merge=lfs -text
 ql2700_fw.bin filter=lfs diff=lfs merge=lfs -text
 ql8300_fw.bin filter=lfs diff=lfs merge=lfs -text
--- a/0001-nvidia-add-missing-entries-in-WHENCE.patch
+++ b/0001-nvidia-add-missing-entries-in-WHENCE.patch
@ -1,58 +0,0 @@
-From 2a3b75dd05e853fc1cac32100eeabaf975b94103 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Fri, 26 Jul 2019 15:47:59 +1000
-Subject: [PATCH] nvidia: add missing entries in WHENCE
-
-Fixes: 93d56c0a0c1fa79b("nvidia: update GP10[2467] SEC2 RTOS with the one already used on GP108")
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
- WHENCE | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/WHENCE b/WHENCE
-index f872138fd696..e221f4033509 100644
--- a/WHENCE
-+++ b/WHENCE
-@@ -3977,6 +3977,9 @@ File: nvidia/gp102/nvdec/scrubber.bin
- File: nvidia/gp102/sec2/desc.bin
- File: nvidia/gp102/sec2/image.bin
- File: nvidia/gp102/sec2/sig.bin
-+File: nvidia/gp102/sec2/desc-1.bin
-+File: nvidia/gp102/sec2/image-1.bin
-+File: nvidia/gp102/sec2/sig-1.bin
- File: nvidia/gp104/acr/bl.bin
- File: nvidia/gp104/acr/ucode_load.bin
- File: nvidia/gp104/acr/ucode_unload.bin
-@@ -3997,6 +4000,9 @@ File: nvidia/gp104/nvdec/scrubber.bin
- File: nvidia/gp104/sec2/desc.bin
- File: nvidia/gp104/sec2/image.bin
- File: nvidia/gp104/sec2/sig.bin
-+File: nvidia/gp104/sec2/desc-1.bin
-+File: nvidia/gp104/sec2/image-1.bin
-+File: nvidia/gp104/sec2/sig-1.bin
- File: nvidia/gp106/acr/bl.bin
- File: nvidia/gp106/acr/ucode_load.bin
- File: nvidia/gp106/acr/ucode_unload.bin
-@@ -4017,6 +4023,9 @@ File: nvidia/gp106/nvdec/scrubber.bin
- File: nvidia/gp106/sec2/desc.bin
- File: nvidia/gp106/sec2/image.bin
- File: nvidia/gp106/sec2/sig.bin
-+File: nvidia/gp106/sec2/desc-1.bin
-+File: nvidia/gp106/sec2/image-1.bin
-+File: nvidia/gp106/sec2/sig-1.bin
- File: nvidia/gp107/acr/bl.bin
- File: nvidia/gp107/acr/ucode_load.bin
- File: nvidia/gp107/acr/ucode_unload.bin
-@@ -4037,6 +4046,9 @@ File: nvidia/gp107/nvdec/scrubber.bin
- File: nvidia/gp107/sec2/desc.bin
- File: nvidia/gp107/sec2/image.bin
- File: nvidia/gp107/sec2/sig.bin
-+File: nvidia/gp107/sec2/desc-1.bin
-+File: nvidia/gp107/sec2/image-1.bin
-+File: nvidia/gp107/sec2/sig-1.bin
- File: nvidia/gp10b/acr/bl.bin
- File: nvidia/gp10b/acr/ucode_load.bin
- File: nvidia/gp10b/gr/fecs_bl.bin
-- 
-2.16.4
-
--- a/WHENCE-iwlwifi-9xxx-46-revert.patch
+++ b/WHENCE-iwlwifi-9xxx-46-revert.patch
@ -1,20 +0,0 @@
--- a/WHENCE
-+++ b/WHENCE
-@@ -1019,7 +1019,7 @@ File: iwlwifi-9000-pu-b0-jf-b0-43.ucode
- Version: 43.95eb4e97.0
- 
- File: iwlwifi-9000-pu-b0-jf-b0-46.ucode
-Version: 46.a41adfe7.0
-+Version: 46.3cfab8da.0
- 
- File: iwlwifi-9260-th-b0-jf-b0-33.ucode
- Version: 33.610294.0
-@@ -1037,7 +1037,7 @@ File: iwlwifi-9260-th-b0-jf-b0-43.ucode
- Version: 43.95eb4e97.0
- 
- File: iwlwifi-9260-th-b0-jf-b0-46.ucode
-Version: 46.a41adfe7.0
-+Version: 46.3cfab8da.0
- 
- File: iwlwifi-cc-a0-46.ucode
- Version: 46.3cfab8da.0
--- a/2
+++ b/2
@ -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">d52556e4592e64023157a83fb0f483661f23ac0e</param></service></servicedata>
+          <param name="changesrevision">07b925b450bfb4cf3e141c612ec5b104658cd020</param></service></servicedata>
--- a/aliases.list
+++ b/aliases.list
@ -219,6 +219,13 @@ amdgpu: pci:v00001002d000069AFsv*sd*bc*sc*i*
 amdgpu: pci:v00001002d00006FDFsv*sd*bc*sc*i*
 amdgpu: pci:v00001002d00007300sv*sd*bc*sc*i*
 amdgpu: pci:v00001002d0000730Fsv*sd*bc*sc*i*
+amdgpu: pci:v00001002d00007310sv*sd*bc*sc*i*
+amdgpu: pci:v00001002d00007312sv*sd*bc*sc*i*
+amdgpu: pci:v00001002d00007318sv*sd*bc*sc*i*
+amdgpu: pci:v00001002d00007319sv*sd*bc*sc*i*
+amdgpu: pci:v00001002d0000731Asv*sd*bc*sc*i*
+amdgpu: pci:v00001002d0000731Bsv*sd*bc*sc*i*
+amdgpu: pci:v00001002d0000731Fsv*sd*bc*sc*i*
 amdgpu: pci:v00001002d00009830sv*sd*bc*sc*i*
 amdgpu: pci:v00001002d00009831sv*sd*bc*sc*i*
 amdgpu: pci:v00001002d00009832sv*sd*bc*sc*i*
@ -310,6 +317,8 @@ ar5523: usb:v2001p3A02d*dc*dsc*dp*ic*isc*ip*in*
 ar5523: usb:v2001p3A03d*dc*dsc*dp*ic*isc*ip*in*
 ar5523: usb:v2001p3A04d*dc*dsc*dp*ic*isc*ip*in*
 ar5523: usb:v2001p3A05d*dc*dsc*dp*ic*isc*ip*in*
+ast: pci:v00001A03d00002000sv*sd*bc03sc*i*
+ast: pci:v00001A03d00002010sv*sd*bc03sc*i*
 ath10k_pci: of:N*T*Cqcom,ipq4019-wifi
 ath10k_pci: of:N*T*Cqcom,ipq4019-wifiC*
 ath10k_pci: pci:v00000777d000011ACsv*sd*bc*sc*i*
@ -321,6 +330,9 @@ ath10k_pci: pci:v0000168Cd00000042sv*sd*bc*sc*i*
 ath10k_pci: pci:v0000168Cd00000046sv*sd*bc*sc*i*
 ath10k_pci: pci:v0000168Cd00000050sv*sd*bc*sc*i*
 ath10k_pci: pci:v0000168Cd00000056sv*sd*bc*sc*i*
+ath10k_sdio: sdio:c*v0271d050A*
+ath10k_sdio: sdio:c*v0271d0701*
+ath10k_usb: usb:v13B1p0042d*dc*dsc*dp*ic*isc*ip*in*
 ath3k: usb:v03F0p311Dd*dc*dsc*dp*ic*isc*ip*in*
 ath3k: usb:v0489pE027d*dc*dsc*dp*ic*isc*ip*in*
 ath3k: usb:v0489pE02Cd*dc*dsc*dp*ic*isc*ip*in*
@ -1675,11 +1687,13 @@ iwlwifi: pci:v00008086d000002F0sv*sd00001651bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00001652bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00002030bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00002034bc*sc*i*
+iwlwifi: pci:v00008086d000002F0sv*sd00002074bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00004030bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00004070bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd00004234bc*sc*i*
+iwlwifi: pci:v00008086d000002F0sv*sd00004244bc*sc*i*
 iwlwifi: pci:v00008086d000002F0sv*sd000042A4bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00000030bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00000034bc*sc*i*
@ -1711,11 +1725,13 @@ iwlwifi: pci:v00008086d000006F0sv*sd00001651bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00001652bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00002030bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00002034bc*sc*i*
+iwlwifi: pci:v00008086d000006F0sv*sd00002074bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00004030bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00004070bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd00004234bc*sc*i*
+iwlwifi: pci:v00008086d000006F0sv*sd00004244bc*sc*i*
 iwlwifi: pci:v00008086d000006F0sv*sd000042A4bc*sc*i*
 iwlwifi: pci:v00008086d00000885sv*sd00001305bc*sc*i*
 iwlwifi: pci:v00008086d00000885sv*sd00001307bc*sc*i*
@ -2016,9 +2032,13 @@ iwlwifi: pci:v00008086d00002526sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d00002526sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d00002526sv*sd00004234bc*sc*i*
 iwlwifi: pci:v00008086d00002526sv*sd000042A4bc*sc*i*
+iwlwifi: pci:v00008086d00002526sv*sd00006010bc*sc*i*
+iwlwifi: pci:v00008086d00002526sv*sd00006014bc*sc*i*
 iwlwifi: pci:v00008086d00002526sv*sd00008010bc*sc*i*
 iwlwifi: pci:v00008086d00002526sv*sd00008014bc*sc*i*
 iwlwifi: pci:v00008086d00002526sv*sd0000A014bc*sc*i*
+iwlwifi: pci:v00008086d00002526sv*sd0000E010bc*sc*i*
+iwlwifi: pci:v00008086d00002526sv*sd0000E014bc*sc*i*
 iwlwifi: pci:v00008086d0000271Bsv*sd00000010bc*sc*i*
 iwlwifi: pci:v00008086d0000271Bsv*sd00000014bc*sc*i*
 iwlwifi: pci:v00008086d0000271Bsv*sd00000210bc*sc*i*
@ -2061,11 +2081,13 @@ iwlwifi: pci:v00008086d00002720sv*sd00001651bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00001652bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00002030bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00002034bc*sc*i*
+iwlwifi: pci:v00008086d00002720sv*sd00002074bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00004030bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00004070bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd00004234bc*sc*i*
+iwlwifi: pci:v00008086d00002720sv*sd00004244bc*sc*i*
 iwlwifi: pci:v00008086d00002720sv*sd000042A4bc*sc*i*
 iwlwifi: pci:v00008086d00002723sv*sd00000080bc*sc*i*
 iwlwifi: pci:v00008086d00002723sv*sd00000084bc*sc*i*
@ -2080,6 +2102,7 @@ iwlwifi: pci:v00008086d00002725sv*sd00000020bc*sc*i*
 iwlwifi: pci:v00008086d00002725sv*sd00000090bc*sc*i*
 iwlwifi: pci:v00008086d00002725sv*sd000000B0bc*sc*i*
 iwlwifi: pci:v00008086d00002725sv*sd00000310bc*sc*i*
+iwlwifi: pci:v00008086d00002725sv*sd00000510bc*sc*i*
 iwlwifi: pci:v00008086d00002725sv*sd00000A10bc*sc*i*
 iwlwifi: pci:v00008086d000030DCsv*sd00000030bc*sc*i*
 iwlwifi: pci:v00008086d000030DCsv*sd00000034bc*sc*i*
@ -2177,11 +2200,13 @@ iwlwifi: pci:v00008086d000034F0sv*sd00001651bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00001652bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00002030bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00002034bc*sc*i*
+iwlwifi: pci:v00008086d000034F0sv*sd00002074bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00004030bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00004070bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd00004234bc*sc*i*
+iwlwifi: pci:v00008086d000034F0sv*sd00004244bc*sc*i*
 iwlwifi: pci:v00008086d000034F0sv*sd000042A4bc*sc*i*
 iwlwifi: pci:v00008086d00003DF0sv*sd00000030bc*sc*i*
 iwlwifi: pci:v00008086d00003DF0sv*sd00000034bc*sc*i*
@ -2306,14 +2331,22 @@ iwlwifi: pci:v00008086d000043F0sv*sd00001651bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00001652bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00002030bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00002034bc*sc*i*
+iwlwifi: pci:v00008086d000043F0sv*sd00002074bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00004030bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00004070bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd00004234bc*sc*i*
+iwlwifi: pci:v00008086d000043F0sv*sd00004244bc*sc*i*
 iwlwifi: pci:v00008086d000043F0sv*sd000042A4bc*sc*i*
 iwlwifi: pci:v00008086d00007A70sv*sd00000090bc*sc*i*
 iwlwifi: pci:v00008086d00007A70sv*sd00000310bc*sc*i*
+iwlwifi: pci:v00008086d00007A70sv*sd00000510bc*sc*i*
+iwlwifi: pci:v00008086d00007A70sv*sd00000A10bc*sc*i*
+iwlwifi: pci:v00008086d00007AF0sv*sd00000090bc*sc*i*
+iwlwifi: pci:v00008086d00007AF0sv*sd00000310bc*sc*i*
+iwlwifi: pci:v00008086d00007AF0sv*sd00000510bc*sc*i*
+iwlwifi: pci:v00008086d00007AF0sv*sd00000A10bc*sc*i*
 iwlwifi: pci:v00008086d00009DF0sv*sd00000000bc*sc*i*
 iwlwifi: pci:v00008086d00009DF0sv*sd00000010bc*sc*i*
 iwlwifi: pci:v00008086d00009DF0sv*sd00000030bc*sc*i*
@ -2388,11 +2421,13 @@ iwlwifi: pci:v00008086d0000A0F0sv*sd00001651bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00001652bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00002030bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00002034bc*sc*i*
+iwlwifi: pci:v00008086d0000A0F0sv*sd00002074bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00004030bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00004034bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00004070bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd000040A4bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd00004234bc*sc*i*
+iwlwifi: pci:v00008086d0000A0F0sv*sd00004244bc*sc*i*
 iwlwifi: pci:v00008086d0000A0F0sv*sd000042A4bc*sc*i*
 iwlwifi: pci:v00008086d0000A370sv*sd00000030bc*sc*i*
 iwlwifi: pci:v00008086d0000A370sv*sd00000034bc*sc*i*
@ -2498,6 +2533,12 @@ libertas_tf_usb: usb:v1286p2001d*dc*dsc*dp*ic*isc*ip*in*
 liquidio: pci:v0000177Dd00000091sv*sd*bc*sc*i*
 liquidio: pci:v0000177Dd00000092sv*sd*bc*sc*i*
 liquidio: pci:v0000177Dd00009702sv*sd*bc*sc*i*
+meson_vdec: of:N*T*Camlogic,gxbb-vdec
+meson_vdec: of:N*T*Camlogic,gxbb-vdecC*
+meson_vdec: of:N*T*Camlogic,gxl-vdec
+meson_vdec: of:N*T*Camlogic,gxl-vdecC*
+meson_vdec: of:N*T*Camlogic,gxm-vdec
+meson_vdec: of:N*T*Camlogic,gxm-vdecC*
 mlxsw_spectrum: pci:v000015B3d0000CB84sv*sd*bc*sc*i*
 mlxsw_spectrum: pci:v000015B3d0000CF6Csv*sd*bc*sc*i*
 msm: of:N*T*Cqcom,mdp4
@ -4533,6 +4574,8 @@ snd_maestro3: pci:v0000125Dd00001998sv*sd*bc04sc01i*
 snd_maestro3: pci:v0000125Dd00001999sv*sd*bc04sc01i*
 snd_maestro3: pci:v0000125Dd0000199Asv*sd*bc04sc01i*
 snd_maestro3: pci:v0000125Dd0000199Bsv*sd*bc04sc01i*
+snd_soc_skl: pci:v00008086d000002C8sv*sd*bc*sc*i*
+snd_soc_skl: pci:v00008086d000006C8sv*sd*bc*sc*i*
 snd_soc_skl: pci:v00008086d00003198sv*sd*bc*sc*i*
 snd_soc_skl: pci:v00008086d00005A98sv*sd*bc*sc*i*
 snd_soc_skl: pci:v00008086d00009D70sv*sd*bc*sc*i*
--- a/copy-firmware.sh
+++ b/copy-firmware.sh
@ -1,30 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-#
-# Copy firmware files based on WHENCE list
-#
-
-verbose=:
-if [ x"$1" = x"-v" ]; then
-    verbose=echo
-    shift
-fi
-
-destdir="$1"
-
-grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do
-    test -f "$f" || continue
-    $verbose "copying file $f"
-    mkdir -p $destdir/$(dirname "$f")
-    cp -d "$f" $destdir/"$f"
-done
-
-grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; do
-    test -L "$f" || continue
-    test -f "$destdir/$f" && continue
-    $verbose "copying link $f"
-    mkdir -p $destdir/$(dirname "$f")
-    cp -d "$f" $destdir/"$f"
-done
-
-exit 0
--- a/iwlwifi-9000-pu-b0-jf-b0-46.ucode
+++ b/iwlwifi-9000-pu-b0-jf-b0-46.ucode
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ec38e49524c7c1ad7afb3be77391ee17cc802008be671950ce2cde4624b732a
-size 1448644
--- a/iwlwifi-9260-th-b0-jf-b0-46.ucode
+++ b/iwlwifi-9260-th-b0-jf-b0-46.ucode
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c7c941ac6878b012a6f354acbfca66a119584bcfa45b63cfc2b81d6178cc868
-size 1456088
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-e279ecf91a923731ba0d49166478cc9f0a0990e8  iwlwifi-9000-pu-b0-jf-b0-46.ucode
-2ea6ac8c9c03b7a896cff9b3cb569cb4da2099b8  iwlwifi-9260-th-b0-jf-b0-46.ucode
--- a/kernel-firmware-20190712.tar.xz
+++ b/kernel-firmware-20190712.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d70522eeb21c81c76de32c15e97cce40e31d7cab410f5d1d02f629cd4b0680fa
-size 84579064
--- a/kernel-firmware-20190815.tar.xz
+++ b/kernel-firmware-20190815.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a491a38f21e9eda7ba740b44d2fc368222866124cd68a8b2bf1733caadbe198d
+size 84816672
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@ -1,8 +1,43 @@
+-------------------------------------------------------------------
+Wed Aug 21 07:15:38 UTC 2019 - tiwai@suse.com
+
+- Update to version 20190815 (git-commit 07b925b450bf):
+  * Install only listed firmware files
+  * rtw88: add a README file
+  * rtw88: RTL8822C: add WoW firmware v7.3
+  * rtw88: RTL8822C: update rtw8822c_fw.bin to v7.3
+  * ath10k: QCA9984 hw1.0: update board-2.bin
+  * ath10k: QCA9984 hw1.0: update firmware-5.bin to 10.4-3.9.0.2-00046
+  * ath10k: QCA988X hw2.0: update firmware-5.bin to 10.2.4-1.0-00045
+  * ath10k: QCA9888 hw2.0: update board-2.bin
+  * ath10k: QCA9888 hw2.0: update firmware-5.bin to 10.4-3.9.0.2-00040
+  * ath10k: QCA9887 hw1.0: update firmware-5.bin to 10.2.4-1.0-00045
+  * ath10k: QCA6174 hw3.0: update firmware-6.bin to WLAN.RM.4.4.1-00140-QCARMSWPZ-1
+  * ath10k: QCA4019 hw1.0: update board-2.bin
+  * cxgb4: update firmware to revision 1.24.3.0
+  * nfp: update Agilio SmartNIC flower firmware to rev AOTC-2.10.A.38
+  * nvidia: add missing entries in WHENCE
+  * linux-firmware: Update NXP Management Complex firmware to version 10.16.2
+  * iwlwifi: update -48 FWs for Qu and cc
+  * iwlwifi: update FWs for 3168, 7265D, 9000, 9260, 8000, 8265 and cc
+  * drm/i915/firmware: Add v33 of GuC for ICL
+  * drm/i915/firmware: Add v33 of GuC for KBL
+  * drm/i915/firmware: Add v33 of GuC for SKL
+  * drm/i915/firmware: Add v33 of GuC for GLK
+  * drm/i915/firmware: Add v33 of GuC for BXT
+- Drop iwlwifi revert patch, as the fix will go into 5.2.x kernel
+  (bsc#1142128):
+  WHENCE-iwlwifi-9xxx-46-revert.patch
+- Drop the deprecated upstream fix:
+  0001-nvidia-add-missing-entries-in-WHENCE.patch
+- Drop the local copy of copy-file.sh that is already included in
+  the latest linux-git tarball
+
 -------------------------------------------------------------------
 Mon Aug 19 17:30:06 CEST 2019 - tiwai@suse.de

 - Re-group some entries for USB hotpluggable network drivers into
-  kernel-firmware-usb-network subpackage, while moving ath10k1 and
+  kernel-firmware-usb-network subpackage, while moving ath10k and
  mwifiex firmware into the own subpackage, too

 -------------------------------------------------------------------
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@ -19,10 +19,10 @@
 %global flavor @BUILD_FLAVOR@%{nil}

 %define __ksyms_path ^/lib/firmware
-%define version_unconverted 20190712
+%define version_unconverted 20190815

 Name:           kernel-firmware
-Version:        20190712
+Version:        20190815
 Release:        0
 Summary:        Linux kernel firmware files
 License:        SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT
@ -40,15 +40,7 @@ Source8:        ql2600_fw.bin
 Source9:        ql2700_fw.bin
 Source10:       ql8300_fw.bin
 Source99:       %{name}-rpmlintrc
-# temporary revert for the broken iwlwifi firmware (bsc#1142128)
-Source100:      iwlwifi-9000-pu-b0-jf-b0-46.ucode
-Source101:      iwlwifi-9260-th-b0-jf-b0-46.ucode
-Source102:      iwlwifi-sha1sum
-Patch100:       WHENCE-iwlwifi-9xxx-46-revert.patch
-# another fix from upstream
-Patch101:       0001-nvidia-add-missing-entries-in-WHENCE.patch
 # install / build infrastructure
-Source1000:     copy-firmware.sh
 Source1001:     install-split.sh
 Source1002:     list-license.sh
 Source1003:     get_supplements.sh
@ -361,6 +353,13 @@ Supplements:    modalias(pci:v00001002d000069AFsv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00006FDFsv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00007300sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d0000730Fsv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007310sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007312sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007318sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007319sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d0000731Asv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d0000731Bsv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d0000731Fsv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00009830sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00009831sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00009832sv*sd*bc*sc*i*)
@ -618,6 +617,9 @@ Supplements:    modalias(pci:v0000168Cd00000042sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v0000168Cd00000046sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v0000168Cd00000050sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v0000168Cd00000056sv*sd*bc*sc*i*)
+Supplements:    modalias(sdio:c*v0271d050A*)
+Supplements:    modalias(sdio:c*v0271d0701*)
+Supplements:    modalias(usb:v13B1p0042d*dc*dsc*dp*ic*isc*ip*in*)

 %description ath10k
 This package contains compressed kernel firmware files for
@ -1593,11 +1595,13 @@ Supplements:    modalias(pci:v00008086d000002F0sv*sd00001651bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00001652bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00002030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00002034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000002F0sv*sd00002074bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00004030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00004070bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd00004234bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000002F0sv*sd00004244bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000002F0sv*sd000042A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00000030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00000034bc*sc*i*)
@ -1629,11 +1633,13 @@ Supplements:    modalias(pci:v00008086d000006F0sv*sd00001651bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00001652bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00002030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00002034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000006F0sv*sd00002074bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00004030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00004070bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd00004234bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000006F0sv*sd00004244bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000006F0sv*sd000042A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00000885sv*sd00001305bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00000885sv*sd00001307bc*sc*i*)
@ -1934,9 +1940,13 @@ Supplements:    modalias(pci:v00008086d00002526sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002526sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002526sv*sd00004234bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002526sv*sd000042A4bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002526sv*sd00006010bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002526sv*sd00006014bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002526sv*sd00008010bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002526sv*sd00008014bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002526sv*sd0000A014bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002526sv*sd0000E010bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002526sv*sd0000E014bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000271Bsv*sd00000010bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000271Bsv*sd00000014bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000271Bsv*sd00000210bc*sc*i*)
@ -1979,11 +1989,13 @@ Supplements:    modalias(pci:v00008086d00002720sv*sd00001651bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00001652bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00002030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00002034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002720sv*sd00002074bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00004030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00004070bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd00004234bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002720sv*sd00004244bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002720sv*sd000042A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002723sv*sd00000080bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002723sv*sd00000084bc*sc*i*)
@ -1998,6 +2010,7 @@ Supplements:    modalias(pci:v00008086d00002725sv*sd00000020bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002725sv*sd00000090bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002725sv*sd000000B0bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002725sv*sd00000310bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00002725sv*sd00000510bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00002725sv*sd00000A10bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000030DCsv*sd00000030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000030DCsv*sd00000034bc*sc*i*)
@ -2095,11 +2108,13 @@ Supplements:    modalias(pci:v00008086d000034F0sv*sd00001651bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00001652bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00002030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00002034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000034F0sv*sd00002074bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00004030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00004070bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd00004234bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000034F0sv*sd00004244bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000034F0sv*sd000042A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00003DF0sv*sd00000030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00003DF0sv*sd00000034bc*sc*i*)
@ -2232,14 +2247,22 @@ Supplements:    modalias(pci:v00008086d000043F0sv*sd00001651bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00001652bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00002030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00002034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000043F0sv*sd00002074bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00004030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00004070bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd00004234bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000043F0sv*sd00004244bc*sc*i*)
 Supplements:    modalias(pci:v00008086d000043F0sv*sd000042A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00007A70sv*sd00000090bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00007A70sv*sd00000310bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00007A70sv*sd00000510bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00007A70sv*sd00000A10bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00007AF0sv*sd00000090bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00007AF0sv*sd00000310bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00007AF0sv*sd00000510bc*sc*i*)
+Supplements:    modalias(pci:v00008086d00007AF0sv*sd00000A10bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00009DF0sv*sd00000000bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00009DF0sv*sd00000010bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00009DF0sv*sd00000030bc*sc*i*)
@ -2314,11 +2337,13 @@ Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00001651bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00001652bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00002030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00002034bc*sc*i*)
+Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00002074bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00004030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00004034bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00004070bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd000040A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00004234bc*sc*i*)
+Supplements:    modalias(pci:v00008086d0000A0F0sv*sd00004244bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A0F0sv*sd000042A4bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A370sv*sd00000030bc*sc*i*)
 Supplements:    modalias(pci:v00008086d0000A370sv*sd00000034bc*sc*i*)
@ -2411,6 +2436,12 @@ Requires(post): coreutils
 Requires(postun): coreutils
 Conflicts:      kernel < 5.3
 Supplements:    modalias(i2c:cx25840)
+Supplements:    modalias(of:N*T*Camlogic,gxbb-vdec)
+Supplements:    modalias(of:N*T*Camlogic,gxbb-vdecC*)
+Supplements:    modalias(of:N*T*Camlogic,gxl-vdec)
+Supplements:    modalias(of:N*T*Camlogic,gxl-vdecC*)
+Supplements:    modalias(of:N*T*Camlogic,gxm-vdec)
+Supplements:    modalias(of:N*T*Camlogic,gxm-vdecC*)
 Supplements:    modalias(of:N*T*Cmediatek,mt8173-vpu)
 Supplements:    modalias(of:N*T*Cmediatek,mt8173-vpuC*)
 Supplements:    modalias(of:N*T*Csamsung,exynos5433-mfc)
@ -3052,6 +3083,8 @@ Supplements:    modalias(pci:v000010CDd00002300sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000010CDd00002500sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000010CDd00002700sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v0000177Dd00000012sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001A03d00002000sv*sd*bc03sc*i*)
+Supplements:    modalias(pci:v00001A03d00002010sv*sd*bc03sc*i*)
 Supplements:    modalias(pcmcia:m0013c0000f*fn*pfn*pa*pb*pc*pd*)
 Supplements:    modalias(pcmcia:m0032c0A05f*fn*pfn01pa*pb*pc*pd*)
 Supplements:    modalias(pcmcia:m0032c0B05f*fn*pfn01pa*pb*pc*pd*)
@ -4073,6 +4106,13 @@ Supplements:    modalias(pci:v00001002d00007293sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00007297sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00007300sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d0000730Fsv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007310sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007312sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007318sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d00007319sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d0000731Asv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d0000731Bsv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001002d0000731Fsv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00007834sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d00007835sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001002d0000791Esv*sd*bc*sc*i*)
@ -5163,6 +5203,8 @@ Supplements:    modalias(pci:v0000125Dd00001998sv*sd*bc04sc01i*)
 Supplements:    modalias(pci:v0000125Dd00001999sv*sd*bc04sc01i*)
 Supplements:    modalias(pci:v0000125Dd0000199Asv*sd*bc04sc01i*)
 Supplements:    modalias(pci:v0000125Dd0000199Bsv*sd*bc04sc01i*)
+Supplements:    modalias(pci:v00008086d000002C8sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00008086d000006C8sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00003198sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00005A98sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00008086d00009D70sv*sd*bc*sc*i*)
@ -5368,13 +5410,6 @@ various USB WiFi / Ethernet drivers.

 %prep
 %setup -q
-# fixup for iwlwifi
-%patch100 -p1
-sha1sum --quiet -c %{SOURCE102} || exit 1
-cp %{SOURCE100} .
-cp %{SOURCE101} .
-# another fix from usptream
-%patch101 -p1
 # additional firmwares
 cat %{SOURCE1} >> WHENCE
 cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
@ -5385,7 +5420,7 @@ cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
 %install
 mkdir -p %{buildroot}/lib/firmware
 %if "%flavor" != "compressed"
-sh %{_sourcedir}/copy-firmware.sh %{buildroot}/lib/firmware
+sh ./copy-firmware.sh %{buildroot}/lib/firmware
 %else
 sh %{_sourcedir}/install-split.sh %{_sourcedir}/topics.list %{buildroot} < WHENCE
 sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
--- a/kernel-firmware.spec.in
+++ b/kernel-firmware.spec.in
@ -40,15 +40,7 @@ Source8:        ql2600_fw.bin
 Source9:        ql2700_fw.bin
 Source10:       ql8300_fw.bin
 Source99:       %{name}-rpmlintrc
-# temporary revert for the broken iwlwifi firmware (bsc#1142128)
-Source100:      iwlwifi-9000-pu-b0-jf-b0-46.ucode
-Source101:      iwlwifi-9260-th-b0-jf-b0-46.ucode
-Source102:      iwlwifi-sha1sum
-Patch100:       WHENCE-iwlwifi-9xxx-46-revert.patch
-# another fix from upstream
-Patch101:       0001-nvidia-add-missing-entries-in-WHENCE.patch
 # install / build infrastructure
-Source1000:     copy-firmware.sh
 Source1001:     install-split.sh
 Source1002:     list-license.sh
 Source1003:     get_supplements.sh
@ -110,13 +102,6 @@ all files that have been provided by kernel-firmware package.

 %prep
 %setup -q
-# fixup for iwlwifi
-%patch100 -p1
-sha1sum --quiet -c %{SOURCE102} || exit 1
-cp %{SOURCE100} .
-cp %{SOURCE101} .
-# another fix from usptream
-%patch101 -p1
 # additional firmwares
 cat %{SOURCE1} >> WHENCE
 cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
@ -127,7 +112,7 @@ cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
 %install
 mkdir -p %{buildroot}/lib/firmware
 %if "%flavor" != "compressed"
-sh %{_sourcedir}/copy-firmware.sh %{buildroot}/lib/firmware
+sh ./copy-firmware.sh %{buildroot}/lib/firmware
 %else
 sh %{_sourcedir}/install-split.sh %{_sourcedir}/topics.list %{buildroot} < WHENCE
 sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
--- a/licenses.list
+++ b/licenses.list
@ -106,7 +106,7 @@ rtl8188ee:	realtek		LICENCE.rtlwifi_firmware.txt
 rtl8188eu:	realtek		LICENCE.rtlwifi_firmware.txt
 rtl8821ae:	realtek		LICENCE.rtlwifi_firmware.txt
 rtl8822be:	realtek		LICENCE.rtlwifi_firmware.txt
-rtw88:		realtek		LICENCE.rtlwifi_firmware.txt
+rtw88:		realtek		LICENCE.rtlwifi_firmware.txt rtw88/README
 rtl8192ee:	realtek		LICENCE.rtlwifi_firmware.txt
 rtl8723bs:	realtek		LICENCE.rtlwifi_firmware.txt
 rtl8xxxu:	realtek		LICENCE.rtlwifi_firmware.txt
--- a/topics.list
+++ b/topics.list
@ -115,7 +115,7 @@ vt6656:		usb-network		vt6656_stage
 DFU:		atheros		ar3k
 Atheros:	atheros		ar3k
 ath6kl:		atheros		ath6kl_sdio ath6kl_usb
-ath10k:		ath10k		ath10k_pci
+ath10k:		ath10k		ath10k_pci ath10k_sdio ath10k_usb
 myri10ge:	network
 drxk:		media
 ene-ub6250:	platform	ums_eneub6250