diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-20 23:42:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-20 23:42:24 +0100 |
| commit | 425029722042faf7f3b9e94da369d737098f2798 (patch) | |
| tree | ae3eeb293e9459532558f1a57be000e599626407 | |
| parent | 651ff15892ade4ab6362686511bc09625813fca1 (diff) | |
| parent | 3660fd4f7dca16dd0a95a432c29abbe386cc6d90 (diff) | |
| download | vyos-build-425029722042faf7f3b9e94da369d737098f2798.tar.gz vyos-build-425029722042faf7f3b9e94da369d737098f2798.zip | |
Merge pull request #489 from vyos/mergify/bp/sagitta/pr-488
T5954: Enable nvme_hwmon and drivetemp (backport #488)
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index c3430eb7..59563c53 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta" vyos_branch = "sagitta" release_train = "sagitta" -kernel_version = "6.6.12" +kernel_version = "6.6.13" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 9ca7ea55..b42dec00 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -2029,7 +2029,7 @@ CONFIG_NVME_CORE=m CONFIG_BLK_DEV_NVME=m CONFIG_NVME_MULTIPATH=y # CONFIG_NVME_VERBOSE_ERRORS is not set -# CONFIG_NVME_HWMON is not set +CONFIG_NVME_HWMON=m # CONFIG_NVME_RDMA is not set # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set @@ -3711,7 +3711,7 @@ CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set -# CONFIG_SENSORS_DRIVETEMP is not set +CONFIG_SENSORS_DRIVETEMP=m CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_DELL_SMM=m |