Merge staging-next into staging

2021-04-02 00:21:46 +00:00
parent e2191cb47d 9eaff3b9be
commit 636e58e31b
37 changed files with 314 additions and 170 deletions
@@ -536,7 +536,7 @@ let
      KVM_VFIO                          = yes;
      KSM = yes;
      VIRT_DRIVERS = yes;
-      # We nneed 64 GB (PAE) support for Xen guest support
+      # We need 64 GB (PAE) support for Xen guest support
      HIGHMEM64G = { optional = true; tristate = mkIf (!stdenv.is64bit) "y";};

      VFIO_PCI_VGA = mkIf stdenv.is64bit yes;