From eb07d7c999986370089b2e30d2b2b487cbe9206f Mon Sep 17 00:00:00 2001
From: Noel Georgi <git@frezbo.dev>
Date: Tue, 13 Sep 2022 21:39:50 +0530
Subject: [PATCH] chore: bump kernel + enable intel ice drivers

Bump kernel and enable intel ICE drivers for the 800 Series adapters.

Signed-off-by: Noel Georgi <git@frezbo.dev>
---
 kernel/build/config-amd64 | 7 +++++--
 kernel/build/config-arm64 | 8 +++++---
 kernel/prepare/pkg.yaml   | 6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
index 7391d92d..5d153ae6 100644
--- a/kernel/build/config-amd64
+++ b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.67 Kernel Configuration
+# Linux/x86 5.15.68 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
@@ -2426,7 +2426,7 @@ CONFIG_I40E=y
 # CONFIG_I40E_DCB is not set
 CONFIG_IAVF=y
 CONFIG_I40EVF=y
-# CONFIG_ICE is not set
+CONFIG_ICE=y
 # CONFIG_FM10K is not set
 CONFIG_IGC=y
 # CONFIG_JME is not set
@@ -4286,6 +4286,7 @@ CONFIG_INFINIBAND=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_VIRT_DMA=y
 # CONFIG_INFINIBAND_MTHCA is not set
+# CONFIG_INFINIBAND_IRDMA is not set
 # CONFIG_MLX4_INFINIBAND is not set
 # CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_INFINIBAND_OCRDMA is not set
@@ -5466,6 +5467,8 @@ CONFIG_PARMAN=y
 CONFIG_OBJAGG=y
 # end of Library routines
 
+CONFIG_PLDMFW=y
+
 #
 # Kernel hacking
 #
diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
index 51a3b033..a38db658 100644
--- a/kernel/build/config-arm64
+++ b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.67 Kernel Configuration
+# Linux/arm64 5.15.68 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
@@ -364,6 +364,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_ERRATUM_2441009=y
+CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -471,7 +472,6 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
-CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y
@@ -2748,7 +2748,7 @@ CONFIG_I40E=y
 # CONFIG_I40E_DCB is not set
 CONFIG_IAVF=y
 CONFIG_I40EVF=y
-# CONFIG_ICE is not set
+CONFIG_ICE=y
 # CONFIG_FM10K is not set
 CONFIG_IGC=y
 # CONFIG_JME is not set
@@ -5589,6 +5589,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
 CONFIG_INFINIBAND_VIRT_DMA=y
 # CONFIG_INFINIBAND_MTHCA is not set
+# CONFIG_INFINIBAND_IRDMA is not set
 # CONFIG_MLX4_INFINIBAND is not set
 # CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_INFINIBAND_OCRDMA is not set
@@ -7918,6 +7919,7 @@ CONFIG_OBJAGG=y
 # end of Library routines
 
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_PLDMFW=y
 
 #
 # Kernel hacking
diff --git a/kernel/prepare/pkg.yaml b/kernel/prepare/pkg.yaml
index bccfbc91..45d6d07b 100644
--- a/kernel/prepare/pkg.yaml
+++ b/kernel/prepare/pkg.yaml
@@ -5,10 +5,10 @@ dependencies:
   - image: '{{ .TOOLS_IMAGE }}'
 steps:
   - sources:
-      - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.67.tar.xz
+      - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.68.tar.xz
         destination: linux.tar.xz
-        sha256: da47d9a80b694548835ccb553b6eb1a1f3f5d5cddd9e2bd6f4886b99ca14f940
-        sha512: e4a113f11b8fcac3512f5f9a42dfdd30774c8979e4a7877161a0540cfbdbba88cac54cfe081d2f13d60f48b4fe04ea6ea79d6513376f036a67a4f93d45846895
+        sha256: 17bbb3cb5c9ba18583b6679cc28f828aec49c72abbfc6fbde310b0cb17218b7e
+        sha512: fa62e3061a84c7fe79eb69e7c4fd4bf77aebb11ace53fe2bc5a63629a99115d9c406992166ae84526d8854af57cd9cfd173191877ea6639a5fc3c2a60ab22931
     env:
       ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
     prepare: