linux-froidzen: 5.9.12.zen1

3 files changed, 9 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b02cc39a32e3..28135ca6daa5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-froidzen
 	pkgdesc = Linux ZEN with Patches and Modifications
-	pkgver = 5.9.11.zen2
+	pkgver = 5.9.12.zen1
 	pkgrel = 1
-	url = https://github.com/zen-kernel/zen-kernel/commits/v5.9.11-zen2
+	url = https://github.com/zen-kernel/zen-kernel/commits/v5.9.12-zen1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -16,7 +16,7 @@ pkgbase = linux-froidzen
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.9.11-zen2
+	source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.9.12-zen1
 	source = config
 	source = sphinx-workaround.patch
 	source = https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.9.patch
@@ -24,7 +24,7 @@ pkgbase = linux-froidzen
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
 	sha256sums = SKIP
-	sha256sums = c312ab11f58eb747d2f8e3419b842580f95056943e0e92583f7a3bb0ab09b871
+	sha256sums = 23f9693a1b35e4d674eced335a2a2cd8a231a157f362000340ccfdb86b4a98e2
 	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
 	sha256sums = 59d2b5e63c30332bd6e7030e4050ce9722f420b0e5b9bc383e7e93aca4268929
 
diff --git a/PKGBUILD b/PKGBUILD
index f3c082ac3c84..03a6b0f305e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: OriginCode <self@origincode.me>
 
 pkgbase=linux-froidzen
-pkgver=5.9.11.zen2
+pkgver=5.9.12.zen1
 pkgrel=1
 pkgdesc='Linux ZEN with Patches and Modifications'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -27,7 +27,7 @@ validpgpkeys=(
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            'c312ab11f58eb747d2f8e3419b842580f95056943e0e92583f7a3bb0ab09b871'
+            '23f9693a1b35e4d674eced335a2a2cd8a231a157f362000340ccfdb86b4a98e2'
             '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
             '59d2b5e63c30332bd6e7030e4050ce9722f420b0e5b9bc383e7e93aca4268929')
 
@@ -44,7 +44,7 @@ prepare() {
   echo "${pkgbase#linux}" > localversion.20-pkgname
 
   # Workaround for uksm-5.9 patch
-  sed -i "%s/#include <linux\/vmalloc.h>/#include <linux\/vmalloc.h>\r #include <linux\/io_uring.h>/g" uksm-5.9.patch
+  sed -i "s/#include <linux\/vmalloc.h>/#include <linux\/vmalloc.h>\n #include <linux\/io_uring.h>/g" uksm-5.9.patch
 
   local src
   for src in "${source[@]}"; do
diff --git a/config b/config
index 2900a5726182..7942a7a7d863 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.9.4-zen1 Kernel Configuration
+# Linux/x86 5.9.11-zen2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -647,8 +647,6 @@ CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
@@ -8211,6 +8209,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_QIB=m