Merge branch 'updates-from-mistersmee'

2 files changed, 2 insertions, 3 deletions

diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 6b7767c9..a1f0f08e 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -3,7 +3,7 @@
 # fail if upstream's .config changes
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   if [ "${sha256sums[${i}]}" = '08ab868847e357bff25127c5eecc3cf8acd4df6fae09fd97af6f9b82ca7d9274' ]; then
-    sha256sums[${i}]='467aa6d7c55ba54ff443d1e849e9ca63bddf3790ef1e637e1adaeaffd1538b5e'
+    sha256sums[${i}]='88547373caaffc0101f7ed3c90daf4a9a98b55410f8cbc02e36cdb0f47af6cf0'
   fi
 done
 
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index 36a1c344..c5ec0489 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -248,7 +248,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_USERMODE_DRIVER=y
-#CONFIG_BPF_PRELOAD=y
+# CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_PRELOAD_UMD=m
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -10391,5 +10391,4 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
-# CONFIG_BPF_PRELOAD is not set
 # CONFIG_BPF_LSM is not set