From fedeeb98215c905effcd2f201021f185cb6b64ef Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jeremy@merelinux.org>
Date: Mon, 10 Aug 2026 15:56:28 -0400
Subject: [PATCH] linux: enable Dell SMM hwmon for fan monitoring

Also enable CONFIG_NVME_HWMON in the common fragment to expose NVMe
drive temperatures through the hwmon subsystem.
---
 recipes/core/linux/mere-common.config.fragment | 1 +
 recipes/core/linux/mere-x86_64.config.fragment | 1 +
 recipes/core/linux/recipe.kdl                  | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/core/linux/mere-common.config.fragment b/recipes/core/linux/mere-common.config.fragment
index c049fe9b..ea63e53a 100644
--- a/recipes/core/linux/mere-common.config.fragment
+++ b/recipes/core/linux/mere-common.config.fragment
@@ -195,6 +195,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 
 # --- Storage ---
 CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_HWMON=y
 CONFIG_SATA_AHCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
diff --git a/recipes/core/linux/mere-x86_64.config.fragment b/recipes/core/linux/mere-x86_64.config.fragment
index 2057fdc5..40151ea3 100644
--- a/recipes/core/linux/mere-x86_64.config.fragment
+++ b/recipes/core/linux/mere-x86_64.config.fragment
@@ -78,6 +78,7 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_RBTN=m
+CONFIG_SENSORS_DELL_SMM=m
 # Lenovo
 CONFIG_THINKPAD_ACPI=m
 # HP
diff --git a/recipes/core/linux/recipe.kdl b/recipes/core/linux/recipe.kdl
index c9c83467..ce87c83c 100644
--- a/recipes/core/linux/recipe.kdl
+++ b/recipes/core/linux/recipe.kdl
@@ -1,7 +1,7 @@
 recipe {
     name "linux"
     version "6.18.42"
-    release 1
+    release 2
     description "Linux kernel and modules"
     url "http://www.kernel.org"
     licenses "GPL2"
@@ -28,11 +28,11 @@ source "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${recipe.version}.tar
 }
 
 source "mere-common.config.fragment" {
-    blake3 "45a7478f568aa13c98331683b2e87cf210b444e604523efaf95f17ce5556fa63"
+    blake3 "75e9c6376f5ada20338660e92eaba947a6fc2c6f1c03b191a23fe77b3a7ad07e"
 }
 
 source "mere-x86_64.config.fragment" {
-    blake3 "9311385580dea3574f68b4a9eaca362fdb7770bfa332a0321b5cfb2b0711189f"
+    blake3 "3c03fa78986f59bf80d5c4d8e292d99b0c21b9f7dc5e5546e0def71358166bb7"
 }
 
 source "mere-aarch64.config.fragment" {