From b3031fc86692e9d99d2e930440a70061ddf82050d56afed0158c58141b2c9bab Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Mon, 20 Jul 2020 13:53:29 +0000
Subject: [PATCH] Accepting request 821906 from home:tiwai:branches:Kernel:HEAD

- Update to version 20200716 (git commit 1d1c80b69653):
  * Update to 20200629111339 version to aligh SDK. Mainly fix DFS false alarm.
  * rtl_nic: update firmware for RTL8125B
  * Update binary firmware for MT7663 based devices to include firmware offload feature and low power feature.
  * linux-firmware: Update firmware file for Intel Bluetooth AX201
  * linux-firmware: Update firmware file for Intel Bluetooth AX200
  * linux-firmware: Update firmware file for Intel Bluetooth 9560
  * linux-firmware: Update firmware file for Intel Bluetooth 9260
  * linux-firmware: wilc1000: add wilc1000 v15.4 FW
  * QCA: Update Bluetooth firmware for QCA6390
- Revert the previous update of AMDGPU firmware due to regression
  (bsc#1174278); back to the state of 887d2a103c2b

OBS-URL: https://build.opensuse.org/request/show/821906
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=314
---
 _servicedata                    |  2 +-
 amdgpu-887d2a103c2b.tar.xz      |  3 +++
 kernel-firmware-20200702.tar.xz |  3 ---
 kernel-firmware-20200716.tar.xz |  3 +++
 kernel-firmware.changes         | 16 ++++++++++++++++
 kernel-firmware.spec            |  8 +++++---
 6 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 amdgpu-887d2a103c2b.tar.xz
 delete mode 100644 kernel-firmware-20200702.tar.xz
 create mode 100644 kernel-firmware-20200716.tar.xz

diff --git a/_servicedata b/_servicedata
index 25176c5..e9c2b2f 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">74ac3b5a7e7962cd1135ef691c72d48cb5210251</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">1d1c80b696539caa1d8a51d5f573012fbfa7eb5d</param></service></servicedata>
\ No newline at end of file
diff --git a/amdgpu-887d2a103c2b.tar.xz b/amdgpu-887d2a103c2b.tar.xz
new file mode 100644
index 0000000..7865187
--- /dev/null
+++ b/amdgpu-887d2a103c2b.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1989e876f92909fcdfefb6ff1e93b442d9e6728c6ad8fa8b73d45e267cbd099e
+size 4053624
diff --git a/kernel-firmware-20200702.tar.xz b/kernel-firmware-20200702.tar.xz
deleted file mode 100644
index a0c3215..0000000
--- a/kernel-firmware-20200702.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31cee1699f39ed8922ec04c4e28fa5d9197d47710e4f5332f97e31daeb1f78b9
-size 121900320
diff --git a/kernel-firmware-20200716.tar.xz b/kernel-firmware-20200716.tar.xz
new file mode 100644
index 0000000..8f66ce9
--- /dev/null
+++ b/kernel-firmware-20200716.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b70f445114982e44c9daa2d5948f42cbebd307fe974076c9629d53ea1fc15d09
+size 122008024
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 18252ff..d29deb2 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Jul 19 16:21:20 UTC 2020 - tiwai@suse.com
+
+- Update to version 20200716 (git commit 1d1c80b69653):
+  * Update to 20200629111339 version to aligh SDK. Mainly fix DFS false alarm.
+  * rtl_nic: update firmware for RTL8125B
+  * Update binary firmware for MT7663 based devices to include firmware offload feature and low power feature.
+  * linux-firmware: Update firmware file for Intel Bluetooth AX201
+  * linux-firmware: Update firmware file for Intel Bluetooth AX200
+  * linux-firmware: Update firmware file for Intel Bluetooth 9560
+  * linux-firmware: Update firmware file for Intel Bluetooth 9260
+  * linux-firmware: wilc1000: add wilc1000 v15.4 FW
+  * QCA: Update Bluetooth firmware for QCA6390
+- Revert the previous update of AMDGPU firmware due to regression
+  (bsc#1174278); back to the state of 887d2a103c2b
+
 -------------------------------------------------------------------
 Mon Jul 13 09:47:28 UTC 2020 - tiwai@suse.com
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index a2a8cd0..3ab474d 100644
--- 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 20200702
+%define version_unconverted 20200716
 
 Name:           kernel-firmware
-Version:        20200702
+Version:        20200716
 Release:        0
 Summary:        Linux kernel firmware files
 License:        SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT
@@ -40,6 +40,8 @@ Source8:        ql2600_fw.bin
 Source9:        ql2700_fw.bin
 Source10:       ql8300_fw.bin
 Source99:       %{name}-rpmlintrc
+# Revert AMDGPU firmware due to regression (bsc#1174278)
+Source100:      amdgpu-887d2a103c2b.tar.xz
 # install / build infrastructure
 Source1001:     install-split.sh
 Source1002:     list-license.sh
@@ -5636,7 +5638,7 @@ various USB WiFi / Ethernet drivers.
 
 
 %prep
-%setup -q
+%setup -q -a 100
 # additional firmwares
 cat %{SOURCE1} >> WHENCE
 cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .