From 273689bcbd798e70fabef9815ec3dd77b3401952 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 17 Aug 2013 21:10:30 +0200 Subject: [PATCH] linux-3.10: remove the btrfs send patch it helps, but is incomplete. more fixes are coming, but including these would change too much generic btrfs code, which might cause trouble for others. so the best advice is not to use btrfs send yet and wait for 3.11 or 3.12 --- pkgs/os-specific/linux/kernel/patches.nix | 11 ----------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 12 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 62315c4f0e20..561cdc8f9576 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -139,15 +139,4 @@ 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 974a8e2b3049..8993ff2590a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6451,7 +6451,6 @@ 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