Merge master into staging-next

2021-04-24 00:16:17 +00:00
parent 0d0e7ca769 c298ef8855
commit 6e7c70d02d
54 changed files with 1710 additions and 1573 deletions
@@ -210,9 +210,9 @@ in {
    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12";

    # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2.1.0-rc3";
+    version = "2.1.0-rc4";

-    sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw=";
+    sha256 = "sha256-eakOEA7LCJOYDsZH24Y5JbEd2wh1KfCN+qX3QxQZ4e8=";

    isUnstable = true;
  };