From 2dd76425f7b3b3e821ca2755da3e40952baacb8c Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 5 Dec 2016 16:43:17 +0100
Subject: main/btrfs-progs: upgrade to 4.8.5

---
 main/btrfs-progs/APKBUILD       | 14 +++++++-------
 main/btrfs-progs/includes.patch |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 9193ee2aeb..40816ef9d8 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=btrfs-progs
-pkgver=4.7.3
+pkgver=4.8.5
 pkgrel=0
 pkgdesc="BTRFS filesystem utilities"
 url="https://btrfs.wiki.kernel.org/"
@@ -69,12 +69,12 @@ extra() {
 	rmdir "$subpkgdir"/usr/lib
 }
 
-md5sums="b2dc5175a721247d982be6d98e1e7525  btrfs-progs-v4.7.3.tar.xz
-a79fe97241a26ec2a4be9fc566fa8e29  includes.patch
+md5sums="c2be5b040bd8605be7e98a907a043e45  btrfs-progs-v4.8.5.tar.xz
+99a7512615927bbb983afe29c7f09813  includes.patch
 204ac1381fc0c373bc809d6a453615f2  musl-compat.patch"
-sha256sums="90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c  btrfs-progs-v4.7.3.tar.xz
-dc66938029c887fd29e69ce53f8acc8ac0f01fa49fede3b08c00f2f7acdb1f2a  includes.patch
+sha256sums="d247b1c022aca5def3415bfa51e00c566cce36660a3ee517d4b6a1af911a08ef  btrfs-progs-v4.8.5.tar.xz
+148785bbdf3d029ebd34fa3b8b248a92cf2866f117d3a3f1895cf81ea6c8b7e7  includes.patch
 fa678596c2979f929447f2fdface52823d9bea93d0f49d086ada07b7e57bae34  musl-compat.patch"
-sha512sums="2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a  btrfs-progs-v4.7.3.tar.xz
-2040092c94096da283ca69ec0dd910ebd5329840df86e607226cc054e8b29112720c798b63f9630e35ed28c7c057bb433b09d8aec8df8c4793a6f1ecaa8be846  includes.patch
+sha512sums="497c221fe329febc7cca777e347e8ab6ebb368070d35cb5122214bcf928eb2e7e854f7b0af5bc846f0d34ad84dfb33b372d24bf947ca0b15cb83291c390c664b  btrfs-progs-v4.8.5.tar.xz
+96aa477d0879f1c94d51ce5cc8f31e8bc304a08788684b3837f96ba6aa622f94917f22c731f2e431fd10c84f3828bb16d6eb9a20ee128df5810a41d8df5e7aa4  includes.patch
 5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0  musl-compat.patch"
diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index 6836acb506..c3e4bc4097 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -1,7 +1,7 @@
 diff --git a/bitops.h b/bitops.h
 index 323c571..7f30b06 100644
---- a/bitops.h
-+++ b/bitops.h
+--- a/kernel-lib/bitops.h
++++ b/kernel-lib/bitops.h
 @@ -65,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w)
  }
  
@@ -24,8 +24,8 @@ index bb03194e127e..28f832a2e625 100644
  #include <stdint.h>
  
  #define ptr_to_u64(x)	((u64)(uintptr_t)x)
---- a/rbtree.h
-+++ b/rbtree.h
+--- a/kernel-lib/rbtree.h
++++ b/kernel-lib/rbtree.h
 @@ -38,6 +38,10 @@
  extern "C" {
  #endif
-- 
cgit v1.2.3