Merge branch 'master' into i486

6 files changed, 15 insertions, 33 deletions

diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD
index cbb15f89..318302f7 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=('478cf3011bcb0eebc87b08a718f07ca4aeff48f1ce5b15615da452df8793bb6b'
-            '09b34a98ea8828e1ebef3572e47d51bacd98dfc24c153d69346f54d48aa1f8cb')
+sha256sums=('fa328e6f68a56522e7e5f3e47fc299796cbf3532a26885ff545a6b6aad6eb5ea'
+            '923706a7f0558b19e1f33aa20c3b0de2af34bfdf41398b14577362c94718e6a9')
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index a0f1cfa8..90c6c2ad 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
-pkgver='4.19.6'
+pkgver='4.19.9'
 _srcname=linux-${pkgver}
 pkgrel='1'
 arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('644e61beb66211c0c5c13f91d96de1725055e6eea4cda7bb37ce9929ba8f09c3'
+sha256sums=('fc116cc6829c73944215d3b3ac0fc368dde9e8235b456744afffde001269dbf2'
             'SKIP'
-            'd5581f427d5e9846161f1224b0bf04c22c3c5dac6c8b6bff99f1230cab68d3c5'
+            'b1f72da663020ab122aa757033b2b7766a0bedc360a148cadea0c2b15530f08c'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index b086737f..371470e9 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.6-1 Kernel Configuration
+# Linux/x86 4.19.9-1 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.2.1 20180831
+# Compiler: gcc (GCC) 8.2.1 20181127
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80201
@@ -3416,6 +3416,7 @@ CONFIG_MWL8K=m
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
 CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
 CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x0U=m
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index c725625d..51e6a6ab 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 2e669a90e89f01c68b7b0faf7f6084aabca61c3f
+# upstream git revision: 32c7bb2ff85bb14365f4f0178f57dbd4d7cdc44d
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '4e4da53c86f21f5949519c57884d322a486107ea1559a5ff9f2318c08cafcdf1' ]; then
-    sha256sums[${i}]='42961d0de8c847b7958f8b8ea49278c22edb4887d24d1f90e88008ac65102fcb'
+  if [ "${sha256sums[${i}]}" = '17fe21a4c8507064675bd30c9266c22415fe4118d57161239e27e04ae96e2378' ]; then
+    sha256sums[${i}]='d2e12d879c9956a12bcae7a4d0b02efb3a3e712cca3f442a5a8a81d71581567e'
   fi
 done
 
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index 3f21f6e7..905c6a95 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.4-zen1 Kernel Configuration
+# Linux/x86 4.19.8-zen2 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.2.1 20180831
+# Compiler: gcc (GCC) 8.2.1 20181127
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80201
@@ -1043,8 +1043,8 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
deleted file mode 100644
index 4aaafe29..00000000
--- a/extra/llvm/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# temporary, ocaml is broken on 32-bit, we work around the llvm issue
-# in binutils LTO plugins for now:
-makedepends=(${makedepends[@]/ocaml=$_ocaml_ver/})
-makedepends=(${makedepends[@]/ocaml-ctypes/})
-makedepends=(${makedepends[@]/ocaml-findlib/})
-
-eval "$(
-  declare -f build | \
-    sed '
-      s/ninja all ocaml_doc/ninja all/
-    '
-)"
-
-eval "$(
-  declare -f package_llvm | \
-    sed '
-      /ocaml/d
-    '
-)"