Merge master into staging

2018-04-09 15:12:32 +02:00
parent 2cf343fc96 2ab846211c
commit 0aa59a08d6
165 changed files with 3784 additions and 2183 deletions
@@ -187,9 +187,11 @@ in {
    spl = splUnstable;
  };

+  # TODO: Remove this module before 18.09
+  # also remove boot.zfs.enableLegacyCrypto
  zfsLegacyCrypto = common {
    # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.16";

    # this package should point to a version / git revision compatible with the latest kernel release
    version = "2018-02-01";