From b98093a012f54ebfc06af97871bd2d02d0fc671f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 23 Apr 2015 05:18:46 -0300
Subject: linux-libre-lts-3.14.39_gnu-1: updating version

---
 .../0001-fix-btrfs-mount-deadlock.patch            | 43 ----------------------
 libre/linux-libre-lts/PKGBUILD                     | 10 +----
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 libre/linux-libre-lts/0001-fix-btrfs-mount-deadlock.patch

diff --git a/libre/linux-libre-lts/0001-fix-btrfs-mount-deadlock.patch b/libre/linux-libre-lts/0001-fix-btrfs-mount-deadlock.patch
deleted file mode 100644
index 9430d5833..000000000
--- a/libre/linux-libre-lts/0001-fix-btrfs-mount-deadlock.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9c4f61f01d269815bb7c37be3ede59c5587747c6 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.cz>
-Date: Fri, 2 Jan 2015 19:12:57 +0100
-Subject: btrfs: simplify insert_orphan_item
-
-We can search and add the orphan item in one go,
-btrfs_insert_orphan_item will find out if the item already exists.
-
-Signed-off-by: David Sterba <dsterba@suse.cz>
-
-diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
-index 5be45c1..25a1c36 100644
---- a/fs/btrfs/tree-log.c
-+++ b/fs/btrfs/tree-log.c
-@@ -1254,21 +1254,13 @@ out:
- }
- 
- static int insert_orphan_item(struct btrfs_trans_handle *trans,
--			      struct btrfs_root *root, u64 offset)
-+			      struct btrfs_root *root, u64 ino)
- {
- 	int ret;
--	struct btrfs_path *path;
--
--	path = btrfs_alloc_path();
--	if (!path)
--		return -ENOMEM;
- 
--	ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID,
--			offset, BTRFS_ORPHAN_ITEM_KEY, NULL);
--	if (ret > 0)
--		ret = btrfs_insert_orphan_item(trans, root, offset);
--
--	btrfs_free_path(path);
-+	ret = btrfs_insert_orphan_item(trans, root, ino);
-+	if (ret == -EEXIST)
-+		ret = 0;
- 
- 	return ret;
- }
--- 
-cgit v0.10.2
-
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 9b35485fc..5eaf481ac 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgbase=linux-libre-lts     # Build kernel with -lts localname
 _pkgbasever=3.14-gnu
-_pkgver=3.14.38-gnu
+_pkgver=3.14.39-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -38,12 +38,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
-        '0001-fix-btrfs-mount-deadlock.patch'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         '3.14.26-8475f027b4-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
-            '4a309e65e5740d14f0ea601e97afbf387c448376d76d389358d05e4fe318ce45'
+            'a85855c6bdefd3067df55bf10e17ea16df5a7b92b1306a36d3b8f2bd02b1568b'
             'SKIP'
             'a3d5c9546d61a84c93e59ba0a5cd725715b87cb1171aa224ff1ff960331e3fb1'
             '66edce909f5e051966c42ed104effb2fb706ef1340a4e248b184059f0ae90ab8'
@@ -57,7 +56,6 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            '5967cf53cb9db9f070e8f346c3d7045748e4823a7fe2ee330acd18c9d02bbb77'
             '7c2d1e257acce0ea6f260f3acf18e30e21c12a9a6b3d7d1d4097dafd287388e2')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -104,10 +102,6 @@ prepare() {
   # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18
   patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch"
 
-  # fix #44495 and #44385 deadlock on btrfs mount
-  # https://btrfs.wiki.kernel.org/index.php/Gotchas
-  patch -Np1 -i "${srcdir}/0001-fix-btrfs-mount-deadlock.patch"
-
   # Adding loongson-community patch
   if [ "${CARCH}" == "mips64el" ]; then
     patch -p1 -i ${srcdir}/3.14.26-8475f027b4-loongson-community.patch
-- 
cgit v1.2.3