Merge branch 'master' into i486

2 files changed, 11 insertions, 8 deletions

diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 6bb4429f..70b1e143 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: fb4c47a088b60d47933a0ca736a856a3ed6b80a2
+# upstream git revision: 409fb3f6d729c6bb78d9df1238165c800ba2eaba
 
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '071bdc3d814a56a80c4e40301bcd518662bd9374d6f73b1c9a97b705c5c82bc0' ]; then
-    sha256sums[${i}]='d71c3aed22dca41b2398d187e2f30427b6f8643fcc16006bac46c11e9ff8f6f1'
+  if [ "${sha256sums[${i}]}" = 'bdf972dad118e0dd2ee1bb92f2a009d4c81eb11ff7f54b069d4331a23531af1d' ]; then
+    sha256sums[${i}]='e845b79f1110f1a6fc29b04d0cb6b3248eb0ef4765dbd97341bbe23744bdea3d'
   fi
 done
 
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index c5cbfe9c..b8566dda 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.0-zen1 Kernel Configuration
+# Linux/x86 4.20.3-zen1 Kernel Configuration
 #
 
 #
@@ -17,6 +17,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_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-zen"
@@ -65,6 +66,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -379,6 +381,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
@@ -915,7 +919,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODVERSIONS is not set
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
@@ -2413,7 +2417,6 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -7313,10 +7316,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -9372,7 +9375,7 @@ CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m