From fb99c24d7cc3b8c9df84836170a99c802773d620 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 5 Aug 2012 01:55:16 +0200
Subject: [PATCH] kernel-3.5: add aufs3 patch

---
 pkgs/os-specific/linux/kernel/patches.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 65cd9b3d830..a8c03d0ffb1 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,6 +175,20 @@ rec {
     features.aufs3 = true;
   };
 
+  aufs3_5 = rec {
+    name = "aufs3.5";
+    version = "3.5";
+    utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
+    utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
+    patch = makeAufs3StandalonePatch {
+      inherit version;
+      rev = "4a5e660ed7f5c1d0467c81c535d0fedcfe62d15f";
+      sha256 = "c474573fc03725053e68db481478be74de98abe2c23be60fe08e2f5f2ab3b188";
+    };
+    features.aufsBase = true;
+    features.aufs3 = true;
+  };
+
   # Increase the timeout on CIFS requests from 15 to 120 seconds to
   # make CIFS more resilient to high load on the CIFS server.
   cifs_timeout_2_6_15 =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dfa3ac8748..92d758f935e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5750,7 +5750,7 @@ let
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
-        #kernelPatches.aufs3_4
+        kernelPatches.aufs3_5
       ] ++ lib.optionals (platform.kernelArch == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill