From 14e8d884c4401467f719573b14f46d9f17b884b1 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sat, 12 Feb 2022 08:27:30 +0100
Subject: [PATCH] pkg: Update to kernel 5.16.9

---
 .github/workflows/debian.yml                  |  2 +-
 pkg/arch/kernel/PKGBUILD                      |  4 ++--
 pkg/arch/kernel/config                        | 11 ++++++++---
 pkg/fedora/kernel-surface/kernel-surface.spec |  4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index c55490d0b..97aac603c 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -7,7 +7,7 @@ name: Debian
 
 env:
   GPG_KEY_ID: 56C464BAAC421453
-  KERNEL_VERSION: 5.16.8
+  KERNEL_VERSION: 5.16.9
   KERNEL_REVISION: 1
   LOCALVERSION: -surface
   MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD
index c87d4b861..dbb309b12 100644
--- a/pkg/arch/kernel/PKGBUILD
+++ b/pkg/arch/kernel/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-surface
-pkgver=5.16.8.arch1
+pkgver=5.16.9.arch1
 pkgrel=1
 pkgdesc='Linux'
 _shortver=${pkgver%.*}
@@ -48,7 +48,7 @@ validpgpkeys=(
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            '7cbba374356a189faac71001c5344ce8f02434684b1ce1accefc0cc4bd6718e5'
+            'a7e88715c86f2ea77e80cb0535d827406676cb8227a9367dd98931f511b06f31'
             '63e0aa01e590c789a2a312f48cdc467b29734465cdf87e206b7a7e0f82e22bc4'
             'b30cd71018df7e98101ba0cf37054169006b096d2870a9f8467dd96378b02b98'
             'b170be558d9f62cec7afec5e2bb002524256d5fa1d82dc0412b3dd7cd0c7e6fb'
diff --git a/pkg/arch/kernel/config b/pkg/arch/kernel/config
index 40c80191b..b6cab2ef3 100644
--- a/pkg/arch/kernel/config
+++ b/pkg/arch/kernel/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.16.0-arch1 Kernel Configuration
+# Linux/x86 5.16.9-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -1071,7 +1071,11 @@ CONFIG_SECRETMEM=y
 #
 # Data Access Monitoring
 #
-# CONFIG_DAMON is not set
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_DBGFS=y
+CONFIG_DAMON_RECLAIM=y
 # end of Data Access Monitoring
 # end of Memory Management options
 
@@ -6541,6 +6545,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
@@ -9974,7 +9979,7 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
-CONFIG_ZERO_CALL_USED_REGS=y
+# CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
 # end of Kernel hardening options
 # end of Security options
diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec
index 01045cecf..73c2fd24d 100755
--- a/pkg/fedora/kernel-surface/kernel-surface.spec
+++ b/pkg/fedora/kernel-surface/kernel-surface.spec
@@ -2,8 +2,8 @@
 # Definitions to configure the kernel we want to build
 #
 
-%global kernel_tag_fc35 kernel-5.16.8-200.fc35
-%global kernel_tag_fc34 kernel-5.16.8-100.fc34
+%global kernel_tag_fc35 kernel-5.16.9-200.fc35
+%global kernel_tag_fc34 kernel-5.16.9-100.fc34
 
 %global kernel_release_fc35 1
 %global kernel_release_fc34 1