Merge branch 'master' into i486

5 files changed, 10 insertions, 11 deletions

diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index bc29e7a5..80da221f 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
 _srcname=linux-4.17
-pkgver=4.17.7
+pkgver=4.17.8
 pkgrel=1
 arch=('i686')
 url="https://www.kernel.org/"
@@ -29,9 +29,9 @@ validpgpkeys=(
 )
 sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
             'SKIP'
-            '7f96003274d45fabda457951919c68a5856c7b40e4ee230baa0492dd8caf2e97'
+            '146f68fa5ded4c33f3bafba23224ed8fae2a27f701257c899c6a4a7fa61eb6d0'
             'SKIP'
-            '8c7c3fc8e594abe5894b620ea77c889a97af68e8d53c96246e089a3b26be582f'
+            'bf04f144e4637534e484d9f168a93a0d07707c0f86e15f776568a4daa8cf9310'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 1f6b8d30..3a00533b 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.7-1 Kernel Configuration
+# Linux/x86 4.17.8-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/extra/linux-pae/linux-4.17.tar.xz.part b/extra/linux-pae/linux-4.17.tar.xz.part
new file mode 100644
index 00000000..448ee231
--- /dev/null
+++ b/extra/linux-pae/linux-4.17.tar.xz.part
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index a27f746a..a953a8b6 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,8 +1,8 @@
-# upstream git revision: 42ba24c8b0c817ab8e851b6da41582d14127c358
+# upstream git revision: d299e4f0ee4303f6184169b7c55c2fbf54d158f2
 
 # fail if upstream's .config changes
-if [ "${sha256sums[6]}" = 'd75bb73c44df4c386c8fa2123ca52ec5255d5e52ad804872120824185cf1ba38' ]; then
-  sha256sums[6]='68a5c63153bc08a48d013f373f321eb012b585d3b816d612ab2b0bfa3c4dd22a'
+if [ "${sha256sums[6]}" = '02684ffee3ee036bc7b5362e413dd04fe7dcaed307f9dbd36e3b1f8fc6f05d54' ]; then
+  sha256sums[6]='17d551876b9a7597f3e3a77bfe88c7b8b6df1b2ec3e50112879899075e38b27c'
 fi
 
 eval "$(
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index f66c880c..7ef4698b 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.5-1 Kernel Configuration
+# Linux/x86 4.17.8-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -6390,7 +6390,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
@@ -6908,7 +6908,7 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 #
 # USB Miscellaneous drivers
@@ -9395,7 +9395,6 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m