From 6f145a48e009f3ac4dfe6d9b9d5c3836a4fe12fd Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 30 Apr 2020 16:02:16 +0200
Subject: extra/linux-zen: fix config

---
 extra/linux-zen/PKGBUILD |  4 ++--
 extra/linux-zen/config   | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'extra')

diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index c5638fb2..5e9c873d 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: ee389923b75fed2600e9bfec546692ccceaf9ec2
+# upstream git revision: f69dee8a35b4c0cfc7e8c7f3c7db350488d376df
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   if [ "${sha256sums[${i}]}" = '01db2a42315527698b76edee1a836af56b805e18c363086aa7cc57db377ad553' ]; then
-    sha256sums[${i}]='8bc2695b13bde25c9bdba4ed443daad2356a7c4bdae3755e32d82bf578eba222'
+    sha256sums[${i}]='2d88b4280bab4c8c052ee72ced7de8fe12dfd04c3fbd719df6284223301d3fcb'
   fi
 done
 
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index 084bbd8f..d5decdfe 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.3-zen1 Kernel Configuration
+# Linux/x86 5.6.8-zen1 Kernel Configuration
 #
 
 #
-# Compiler: gcc (Arch Linux 9.3.0-1) 9.3.0
+# Compiler: gcc (Arch Linux 9.3.0-1.2) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
@@ -21,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 # General setup
 #
+# CONFIG_SCHED_MUQSS is not set
 CONFIG_ZEN_INTERACTIVE=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
@@ -415,6 +416,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_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -4439,6 +4442,7 @@ CONFIG_SCx200_ACB=m
 CONFIG_I2C_FSI=m
 # end of I2C Hardware Bus support
 
+CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
@@ -6710,6 +6714,7 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
+# CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_SEQUENCER=m
@@ -9873,6 +9878,7 @@ CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -10043,6 +10049,7 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="lockdown,yama"
 
 #
 # Kernel hardening options
@@ -10743,8 +10750,3 @@ CONFIG_LKDTM=m
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
-CONFIG_I2C_STUB=m
-CONFIG_LSM="lockdown,yama"
-# CONFIG_SND_CTL_VALIDATION is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
-# Linux/x86 5.6.8-zen1 Kernel Configuration
-- 
cgit v1.2.3-70-g09d2