Merge branch 'master' into i486

2 files changed, 0 insertions, 16 deletions

diff --git a/core/btrfs-progs/FS#58237.patch b/core/btrfs-progs/FS#58237.patch
deleted file mode 100644
index 21a11fc3..00000000
--- a/core/btrfs-progs/FS#58237.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/utils.c b/utils.c
-index e9cb3a82f..f867e5a7f 100644
---- a/utils.c
-+++ b/utils.c
-@@ -2484,11 +2484,6 @@ const char *subvol_strip_mountpoint(const char *mnt, const char *full_path)
- 	if (!len)
- 		return full_path;
- 
--	if ((strncmp(mnt, full_path, len) != 0) || (full_path[len] != '/')) {
--		error("not on mount point: %s", mnt);
--		exit(1);
--	}
--
- 	if (mnt[len - 1] != '/')
- 		len += 1;
- 
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
deleted file mode 100644
index e69de29b..00000000
--- a/core/btrfs-progs/PKGBUILD
+++ /dev/null