Merge branch 'master' into i486

2 files changed, 7 insertions, 7 deletions

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