diff --git a/.gitattributes b/.gitattributes
index 6d5fa65..ad4a8fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -23,17 +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-3160-17.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-3168-29.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-7260-17.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-7265-17.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-7265D-29.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-8000C-31.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-8000C-34.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-8265-31.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-8265-34.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-9000-pu-b0-jf-b0-33.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-9260-th-b0-jf-b0-33.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
diff --git a/WHENCE-iwlwifi-update.patch b/WHENCE-iwlwifi-update.patch
deleted file mode 100644
index b3eb1df..0000000
--- a/WHENCE-iwlwifi-update.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/WHENCE b/WHENCE
-index b2dc6a10abb2..61104ef37017 100644
---- a/WHENCE
-+++ b/WHENCE
-@@ -861,7 +861,7 @@ File: iwlwifi-7260-16.ucode
- Version 16.242414.0
-
- File: iwlwifi-7260-17.ucode
--Version 17.459231.0
-+Version 17.608620.0
-
- File: iwlwifi-3160-7.ucode
- Version: 22.1.7.0
-@@ -885,7 +885,7 @@ File: iwlwifi-3160-16.ucode
- Version 16.242414.0
-
- File: iwlwifi-3160-17.ucode
--Version 17.459231.0
-+Version 17.608620.0
-
- File: iwlwifi-7265-8.ucode
- Version: 22.24.8.0
-@@ -906,7 +906,7 @@ File: iwlwifi-7265-16.ucode
- Version 16.242414.0
-
- File: iwlwifi-7265-17.ucode
--Version 17.459231.0
-+Version 17.608620.0
-
- File: iwlwifi-7265D-10.ucode
- Version: 23.15.10.0
-@@ -933,7 +933,7 @@ File: iwlwifi-7265D-27.ucode
- Version 27.541033.0
-
- File: iwlwifi-7265D-29.ucode
--Version 29.541020.0
-+Version 29.610311.0
-
- File: iwlwifi-3168-21.ucode
- Version 21.302800.0
-@@ -945,7 +945,7 @@ File: iwlwifi-3168-27.ucode
- Version 27.541033.0
-
- File: iwlwifi-3168-29.ucode
--Version 29.541020.0
-+Version 29.610311.0
-
- File: iwlwifi-8000C-13.ucode
- Version: 25.30.13.0
-@@ -963,7 +963,10 @@ File: iwlwifi-8000C-27.ucode
- Version 27.541033.0
-
- File: iwlwifi-8000C-31.ucode
--Version 31.532993.0
-+Version 31.560484.0
-+
-+File: iwlwifi-8000C-34.ucode
-+Version 34.610288.0
-
- File: iwlwifi-8265-21.ucode
- Version 21.302800.0
-@@ -975,7 +978,16 @@ File: iwlwifi-8265-27.ucode
- Version 27.541033.0
-
- File: iwlwifi-8265-31.ucode
--Version 31.532993.0
-+Version 31.560484.0
-+
-+File iwlwifi-8265-34.ucode
-+Version 34.610288.0
-+
-+File: iwlwifi-9260-th-b0-jf-b0-33.ucode
-+Version: 33.610294.0
-+
-+File: iwlwifi-9000-pu-b0-jf-b0-33.ucode
-+Version: 33.610294.0
-
- Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
-
diff --git a/_servicedata b/_servicedata
index 64b74da..8231c4a 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
- 9a0a0548a7bb02d052318ed8f5333005773878f2
\ No newline at end of file
+ 17e6288135d4500f9fe60224dce2b46d850c346b
\ No newline at end of file
diff --git a/iwlwifi-3160-17.ucode b/iwlwifi-3160-17.ucode
deleted file mode 100644
index 3bc9831..0000000
--- a/iwlwifi-3160-17.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d35052682c2495d778825351d11c7a14920a272fc590c1bfa732b93d29d62009
-size 918268
diff --git a/iwlwifi-3168-29.ucode b/iwlwifi-3168-29.ucode
deleted file mode 100644
index 299b20d..0000000
--- a/iwlwifi-3168-29.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b778c9ac40acbabbea87a3982264ffb04c01a47792f2166a021fef007943766
-size 1036372
diff --git a/iwlwifi-7260-17.ucode b/iwlwifi-7260-17.ucode
deleted file mode 100644
index cc9e026..0000000
--- a/iwlwifi-7260-17.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63fd9cda458444299beaa8172ee43e3d6a4cd35703897f81a21a9cf9fcda72e6
-size 1049340
diff --git a/iwlwifi-7265-17.ucode b/iwlwifi-7265-17.ucode
deleted file mode 100644
index 77e63bf..0000000
--- a/iwlwifi-7265-17.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbe6686088b688ebfb5d1a994a2faa4d02baa1ce1f0464f8a6c55a07d8416352
-size 1180412
diff --git a/iwlwifi-7265D-29.ucode b/iwlwifi-7265D-29.ucode
deleted file mode 100644
index 391d023..0000000
--- a/iwlwifi-7265D-29.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0aa80b4b399337eac19224805e4093f3126549027985f6a0c9c797bd2bd96cc
-size 1036528
diff --git a/iwlwifi-8000C-31.ucode b/iwlwifi-8000C-31.ucode
deleted file mode 100644
index 79328ab..0000000
--- a/iwlwifi-8000C-31.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85ad4200c3933a492431049d71ed31b8f95525a42544441c846bf4988431e5a7
-size 2310116
diff --git a/iwlwifi-8000C-34.ucode b/iwlwifi-8000C-34.ucode
deleted file mode 100644
index af09822..0000000
--- a/iwlwifi-8000C-34.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5476ec3e48825739c4d19a0a690ee72f05717bca797214065037f2077c0249ce
-size 2448976
diff --git a/iwlwifi-8265-31.ucode b/iwlwifi-8265-31.ucode
deleted file mode 100644
index 70c755b..0000000
--- a/iwlwifi-8265-31.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f8c0f2b2c42d61b8284a2a3d3b2b5e0a50a1be8c8adb50ae49b80620136dbff
-size 2307104
diff --git a/iwlwifi-8265-34.ucode b/iwlwifi-8265-34.ucode
deleted file mode 100644
index f233f8c..0000000
--- a/iwlwifi-8265-34.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85566f9473b0774209b8351c2daeea8d5c20116f880082b64af819ca54e3b9f7
-size 2440780
diff --git a/iwlwifi-9000-pu-b0-jf-b0-33.ucode b/iwlwifi-9000-pu-b0-jf-b0-33.ucode
deleted file mode 100644
index 50bca2f..0000000
--- a/iwlwifi-9000-pu-b0-jf-b0-33.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a201addc042738dc5e74109ff828d2382cf0507a55dfffe25f34178026ca9ee7
-size 2632620
diff --git a/iwlwifi-9260-th-b0-jf-b0-33.ucode b/iwlwifi-9260-th-b0-jf-b0-33.ucode
deleted file mode 100644
index 10d9366..0000000
--- a/iwlwifi-9260-th-b0-jf-b0-33.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a0056107c5f3d08c8006002edc183f710c4dd0be2067f03abe8addc96cdf3bb
-size 2637216
diff --git a/kernel-firmware-20171009.tar.xz b/kernel-firmware-20171009.tar.xz
deleted file mode 100644
index 741708c..0000000
--- a/kernel-firmware-20171009.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b755fb3af7523fcd86f37f2dcd9280741cd1a25bfd13dba046d923c1e9cdc2d
-size 46511376
diff --git a/kernel-firmware-20171125.tar.xz b/kernel-firmware-20171125.tar.xz
new file mode 100644
index 0000000..d856ad6
--- /dev/null
+++ b/kernel-firmware-20171125.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a58ec879cd505f340f0a4f9c622762c3701ce8a0deb0728de03ab210db77a65f
+size 50818400
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index febdca8..b042b4f 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Thu Nov 30 13:45:13 UTC 2017 - dimstar@opensuse.org
+
+- Change the shebang of check_whence.py (installed as a
+ non-executable) to point to python3.
+
+-------------------------------------------------------------------
+Thu Nov 30 10:24:19 UTC 2017 - mpluskal@suse.com
+
+- Update to version 20171125:
+ * brcm: update firmware for bcm4358
+ * brcm: update firmware for bcm4356
+ * brcm: update firmware for bcm4354
+ * brcm: introduce firmware for bcm43430 revision 0
+ * brcm: update firmware for bcm4339
+ * Mellanox: Add new mlxsw_spectrum firmware 13.1530.152
+ * WHENCE: Add missing entry for mlxsw_spectrum firmware
+ * WHENCE: Fix typo in entry for iwlwifi-8265-34.ucode
+ * s2255drv: f2255usb: firmware version 1.2.8
+ * amdgpu: add new CP firmware for polaris chips
+ * qed: Add firmware 8.33.1.0
+ * qcom: add venus firmware files for v4.2
+ * qcom: add firmware files for Adreno a530
+ * iwlwifi: add firmware version 34 for new 9000 series
+ * linux-firmware: liquidio: update firmware to v1.7.0
+ * linux-firmware: intel: Update Geminilake audio firmware
+ * iwlwifi: add firmware version 33 for new 9000 series
+ * iwlwifi: add new firmware version 34 for 8000C and 8265
+ * iwlwifi: update firmwares for 3160, 3168, 7260, 7265 and 7265D
+ * iwlwifi: update firmwares for 3160, 3168, 7265D, 8000C and 8265
+ * linux-firmware: DMC firmware for kabylake v1.04
+ * linux-firmware: update Marvell PCIe-USB8997 firmware image
+ * linux-firmware: GuC firmware for kabylake v9.39
+ * linux-firmware: GuC firmware for Broxton v9.29
+ * linux-firmware: GuC firmware for Skylake v9.33
+ * linux-firmware/i915: Add Cannonlake DMC version 1.06
+ * linux-firmware/i915: Add Geminilake DMC version 1.04
+ * WHENCE: Add new qed firmware
+ * WHENCE: Add new radeon firmware
+ * WHENCE: Fix syntax error for iwlwifi-8265-31.ucode entry
+ * Revert "ath10k: QCA988X hw2.0: update firmware to 10.2.4.70.63-2"
+ * ath10k: QCA6174 hw3.0: update board-2.bin
+ * ath10k: QCA6174 hw3.0: update firmware-6.bin to WLAN.RM.4.4.1-00051-QCARMSWP-1
+ * cxgb4: update firmware to revision 1.16.63.0
+ * linux-firmware: update Marvell PCIe-USB8997 firmware image
+ * linux-firmware: update Marvell PCIe-USB8897-A2 firmware image
+* Drop intel wifi firmwares and WHENCE-iwlwifi-update.patch as
+ they are upstreamed
+
-------------------------------------------------------------------
Mon Nov 20 13:28:22 CET 2017 - tiwai@suse.de
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index de3be22..d0923dc 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -17,10 +17,10 @@
%define __ksyms_path ^/lib/firmware
-%define version_unconverted 20170906
+%define version_unconverted 20171125
Name: kernel-firmware
-Version: 20171009
+Version: 20171125
Release: 0
Summary: Linux kernel firmware files
License: SUSE-Firmware AND GPL-2.0 AND GPL-2.0+ AND MIT
@@ -38,19 +38,6 @@ Source8: ql2600_fw.bin
Source9: ql2700_fw.bin
Source10: ql8300_fw.bin
Source99: %{name}-rpmlintrc
-# Intel WiFi updates that still not landed to linux-firmware.git
-Source100: iwlwifi-3160-17.ucode
-Source101: iwlwifi-3168-29.ucode
-Source102: iwlwifi-7260-17.ucode
-Source103: iwlwifi-7265-17.ucode
-Source104: iwlwifi-7265D-29.ucode
-Source105: iwlwifi-8000C-31.ucode
-Source106: iwlwifi-8000C-34.ucode
-Source107: iwlwifi-8265-31.ucode
-Source108: iwlwifi-8265-34.ucode
-Source109: iwlwifi-9000-pu-b0-jf-b0-33.ucode
-Source110: iwlwifi-9260-th-b0-jf-b0-33.ucode
-Patch100: WHENCE-iwlwifi-update.patch
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): coreutils
@@ -105,21 +92,8 @@ This package contains the microcode files used by AMD CPUs.
%prep
%setup -q
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
-cp %{SOURCE100} .
-cp %{SOURCE101} .
-cp %{SOURCE102} .
-cp %{SOURCE103} .
-cp %{SOURCE104} .
-cp %{SOURCE105} .
-cp %{SOURCE107} .
-cp %{SOURCE109} .
-cp %{SOURCE110} .
-# FIXME: *-34.ucode seems buggy with TW kernel, so skipp them (bsc#1068838)
-%if 0
-cp %{SOURCE106} .
-cp %{SOURCE108} .
-%endif
-%patch100 -p1
+# change ./check_whence.py to be a python3 program
+sed -i "s|/usr/bin/python$|/usr/bin/python3|" ./check_whence.py
%build
# nothing to do