Semi-automated update for kernel 4.18.6.arch1-1 + latest git commit

1 files changed, 6 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45c6397ea466..0708ffb7b9dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,16 @@
 pkgbase = zfs-linux-git
-	pkgver = 2018.08.23.r4692.g55972a672.4.18.5.arch1.1
+	pkgver = 2018.09.07.r4720.gb8a90418f_4.18.6.arch1.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
-	makedepends = linux-headers=4.18.5.arch1-1
+	makedepends = linux-headers=4.18.6.arch1-1
 	makedepends = git
 	depends = kmod
-	depends = zfs-utils-common-git=2018.08.23.r4692.g55972a672
-	depends = linux=4.18.5.arch1-1
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=55972a6724ca49d98d67a47fe0f0b28ad21260d5
-	source = upstream-ac09630-Fix-zpl_mount-deadlock.patch
-	source = upstream-9f64c1e-Linux-4.18-compat-inode-timespec_timespec64.patch
-	source = upstream-9161ace-Linux-compat-4.18-check_disk_size_change.patch
+	depends = zfs-utils-common-git=2018.09.07.r4720.gb8a90418f
+	depends = linux=4.18.6.arch1-1
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=b8a90418f3a9c23b89c5d2c729a4dd0fea644508
 	sha256sums = SKIP
-	sha256sums = 1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8
-	sha256sums = 03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d
-	sha256sums = afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe
 
 pkgname = zfs-linux-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
@@ -25,6 +19,7 @@ pkgname = zfs-linux-git
 	provides = zfs
 	conflicts = zfs-linux
 	conflicts = spl-linux-git
+	conflicts = spl-linux
 	replaces = spl-linux-git
 
 pkgname = zfs-linux-git-headers