diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c77785167cc1..e1ec4a55718e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -139,4 +139,15 @@ rec { }; }; + # this patch will probably make it into 3.11 or 3.12 + # it only touches 1 file (fs/btrfs/send.c) so it only affects people that use + # the btrfs send feature. + btrfs_send_backport = + { name = "btrfs-send-check-parent-dir-when-doing-a-compare-send"; + patch = fetchurl { + url = https://patchwork.kernel.org/patch/2839612/mbox; + sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a366b24193a..53c3ba9ec73a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6454,6 +6454,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 + kernelPatches.btrfs_send_backport ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill