Merge branch 'master' into i486

5 files changed, 12 insertions, 9 deletions

diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD
index 386202c7..cd32a441 100644
--- a/extra/flashplugin/PKGBUILD
+++ b/extra/flashplugin/PKGBUILD
@@ -1,4 +1,4 @@
 # bring back the i686 specific stuff
 source=("${source[@]//x86_64/i386}")
-sha256sums=('e86d43d797c692fa48b86e6792978331316b3da08cc1372b35cb9afe732ac15e'
-            'fb18ad1b656fb2e7f7702be819a0150eba2bd72e8c61901dbdba711fa58d9dce')
+sha256sums=('2cce7fcbca9d742539ae5b5e22953cfcd42d7236770d410b819168e627702c04'
+            '28f129ad3a218912a213bc385c601982f7a174303c7418d039ccab3c66fcbf5f')
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index acc7d890..706a4838 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.5
+pkgver=4.17.6
 pkgrel=1
 arch=('i686')
 url="https://www.kernel.org/"
@@ -29,9 +29,9 @@ validpgpkeys=(
 )
 sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
             'SKIP'
-            'cc18fcf14df25f0bab047aa180b9362bd4f3ce96f1b05e1f7764cfcc0e271bbd'
+            '7699b2246e4ed1e284f2947d5e0b66653c27574995caf6a02a3280bd055cfedf'
             'SKIP'
-            '20b7dbea4d52abf9ee9bba4779d8aad07346708b29b0dedd61b7f51a2f52e734'
+            '810db6f47c166a726425b217c753a14a9928db236d608f5b65291c1652141a28'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index a31b3dd0..a0ce2427 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.5-1 Kernel Configuration
+# Linux/x86 4.17.6-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 8ebf550c..a27f746a 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -2,7 +2,7 @@
 
 # fail if upstream's .config changes
 if [ "${sha256sums[6]}" = 'd75bb73c44df4c386c8fa2123ca52ec5255d5e52ad804872120824185cf1ba38' ]; then
-  sha256sums[6]='99dd50b6a8b542d1c59a8d5ef4b230d29476aef1ffb3c55b4bb5197e9e492616'
+  sha256sums[6]='68a5c63153bc08a48d013f373f321eb012b585d3b816d612ab2b0bfa3c4dd22a'
 fi
 
 eval "$(
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index 0e2c6a7e..f66c880c 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.2-1 Kernel Configuration
+# Linux/x86 4.17.5-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -48,6 +48,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_ZEN_INTERACTIVE=y
+# CONFIG_SCHED_MUQSS is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
@@ -530,6 +531,8 @@ CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
+CONFIG_RQ_NONE=y
+CONFIG_SHARERQ=0
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -7466,7 +7469,6 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_AUXDISPLAY=y
-CONFIG_CHARLCD=m
 CONFIG_HD44780=m
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -7479,6 +7481,7 @@ CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m