[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-656-g32e517a

[Aron Xu]

The following commit has been merged in the master branch:
commit 32e517a0af5ef160b0904a54fa047b3523800b87
Merge: 68d4f68ba10b0c244a1bd685f3b22932e96bfb4a 94a40997a3cce64d8f2408a2cc6233fdfa307597
Author: Aron Xu <aron at debian.org>
Date:   Sun Jan 10 20:20:04 2016 +0800

    Merge tag 'upstream/0.6.5.4'
    
    Upstream version 0.6.5.4
    
    Conflicts:
    	META
    	config/kernel-mk-request-fn.m4
    	configure
    	include/sys/zfs_ctldir.h
    	lib/libzfs/libzfs.pc
    	lib/libzfs/libzfs_core.pc
    	module/zfs/arc.c
    	module/zfs/zfs_ctldir.c
    	module/zfs/zpl_inode.c
    	module/zfs/zvol.c
    	rpm/generic/zfs-kmod.spec.in
    	rpm/generic/zfs.spec.in
    	rpm/redhat/zfs.spec.in
    	zfs_config.h.in


-- 
OpenZFS on Linux