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

1 files changed, 4 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5968f4001c4f..edd4d949570f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@
 #
 pkgbase="zfs-linux-vfio-git"
 pkgname=("zfs-linux-vfio-git" "zfs-linux-vfio-git-headers")
-_commit='8005ca4f749f71397197292452ca539a25286b89'
-_zfsver="2018.11.20.r4835.g8005ca4f7"
+_commit='62ee31adcebe64a1b7cdf1225356108a924c595a'
+_zfsver="2018.11.26.r4836.g62ee31adc"
 _kernelver="4.18.5.arch1-1"
 _extramodules="${_kernelver/.arch/-arch}-vfio"
 
@@ -48,7 +48,7 @@ package_zfs-linux-vfio-git() {
     install=zfs.install
     provides=("zfs" "spl")
     groups=("archzfs-linux-vfio-git")
-    conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-vfio' 'spl-linux-vfio-git' 'spl-linux-vfio' "spl-dkms" "spl-dkms-git")
+    conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-vfio' 'spl-linux-vfio-git' 'spl-linux-vfio' "spl-dkms" "spl-dkms-git")
     replaces=("spl-linux-vfio-git")
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
@@ -61,7 +61,7 @@ package_zfs-linux-vfio-git() {
 package_zfs-linux-vfio-git-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
     provides=("zfs-headers" "spl-headers")
-    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "spl-dkms" "spl-dkms-git" "spl-headers")
+    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" "spl-headers")
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"