Revert "Use looser 9pfs caching in VM tests/builds"

edolstra · edolstra · commit c71a893334dd · 2017-02-13T14:38:19.000+01:00
This reverts commit bbd03e2.
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,13 +175,4 @@ rec {
       };
     };
 
-  p9_caching_4_4 = rec
-    { name = "9p-caching.patch";
-      patch = fetchpatch {
-        inherit name;
-        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
-        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
-      };
-    };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -11282,7 +11282,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.p9_caching_4_4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

Original file line number	Diff line number	Diff line change
`@@ -11282,7 +11282,6 @@ with pkgs;`
`11282`	`11282`	`kernelPatches =`
`11283`	`11283`	`[ kernelPatches.bridge_stp_helper`
`11284`	`11284`	`kernelPatches.cpu-cgroup-v2."4.4"`
`11285`		`- kernelPatches.p9_caching_4_4`
`11286`	`11285`	`]`
`11287`	`11286`	`++ lib.optionals ((platform.kernelArch or null) == "mips")`
`11288`	`11287`	`[ kernelPatches.mips_fpureg_emu`