[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.8-3-31-ga540f8d

[Aron Xu]

The following commit has been merged in the master branch:
commit 0f1c2db73e57a7828ebb2a93b2547a1a314e6992
Merge: c4fd3ee79845ea461309aae4be8cc7421d3ca6db 3d248aec65cf20346057276b5973b3fdcb5f9395
Author: Aron Xu <aron at debian.org>
Date:   Fri Jul 14 16:30:36 2017 +0800

    Merge tag 'upstream/0.6.5.11'
    
    Upstream version 0.6.5.11
    
    Conflicts:
    	META
    	config/config.guess
    	config/config.sub
    	config/install-sh
    	config/libtool.m4
    	config/ltmain.sh
    	configure
    	lib/libzfs/libzfs.pc
    	lib/libzfs/libzfs_core.pc
    	rpm/generic/zfs-kmod.spec.in
    	rpm/generic/zfs.spec.in
    	rpm/redhat/zfs.spec.in


-- 
UNNAMED PROJECT