pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #304850 from K900/kconfig-fixes

linux/common-config: fix fallout from #293302

authored by

K900 and committed by
GitHub 38278d84 d2482fd1

+7 -3
+7 -3
pkgs/os-specific/linux/kernel/common-config.nix
··· 1053 1053 1054 1054 NVME_MULTIPATH = yes; 1055 1055 1056 - NVME_AUTH = whenAtLeast "6.0" yes; 1056 + NVME_AUTH = mkMerge [ 1057 + (whenBetween "6.0" "6.7" yes) 1058 + (whenAtLeast "6.7" module) 1059 + ]; 1060 + 1057 1061 NVME_HOST_AUTH = whenAtLeast "6.7" yes; 1058 1062 NVME_TCP_TLS = whenAtLeast "6.7" yes; 1059 1063 1060 1064 NVME_TARGET = module; 1061 - NVME_TARGET_PASSTHROUGH = whenAtLeast "5.1" yes; 1065 + NVME_TARGET_PASSTHRU = whenAtLeast "5.9" yes; 1062 1066 NVME_TARGET_AUTH = whenAtLeast "6.0" yes; 1063 1067 NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes; 1064 1068 1065 - PCI_P2PDMA = mkIf stdenv.hostPlatform.is64bit yes; 1069 + PCI_P2PDMA = mkIf (stdenv.hostPlatform.is64bit && versionAtLeast version "4.20") yes; 1066 1070 1067 1071 PSI = whenAtLeast "4.20" yes; 1068 1072