Merge master into staging-next

2021-02-11 00:36:09 +00:00
parent 7d94bb26bb 41d270c2aa
commit 5f9df37683
27 changed files with 147 additions and 93 deletions
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -7,6 +7,7 @@ buildLinux (args // {
  src = fetchFromGitHub {
    owner = "koverstreet";
    repo = "bcachefs";
+    # commit does not exist on any branch on the target repository
    rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc";
    sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc";
  };