Merge master into staging-next

2019-05-14 10:23:13 +02:00
parent ef0dbef7f1 f2affe0344
commit 8abe5ee07e
307 changed files with 3534 additions and 1507 deletions
@@ -427,6 +427,12 @@ let

      VFIO_PCI_VGA = mkIf stdenv.is64bit yes;

+      # VirtualBox guest drivers in the kernel conflict with the ones in the
+      # official additions package and prevent the vboxsf module from loading,
+      # so disable them for now.
+      VBOXGUEST = option no;
+      DRM_VBOXVIDEO = option no;
+
    } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
      XEN = option yes;