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

Aron Xu aron at debian.org
Sun Nov 1 04:45:24 UTC 2015


The following commit has been merged in the master branch:
commit e87e98663760ad8b9f3aa8166f29eb0adbb00b61
Merge: 3d66721f2294f4eab7f83274d6486cda86bc7ef7 23d562087708e563bbaae2b54eb127bb65d7cf15
Author: Aron Xu <aron at debian.org>
Date:   Sun Nov 1 12:45:43 2015 +0800

    Merge tag 'upstream/0.6.5.3'
    
    Upstream version 0.6.5.3
    
    Conflicts:
    	META
    	Makefile.am
    	Makefile.in
    	aclocal.m4
    	cmd/Makefile.in
    	cmd/arc_summary/Makefile.am
    	cmd/arc_summary/Makefile.in
    	cmd/arc_summary/arc_summary.py
    	cmd/arcstat/Makefile.in
    	cmd/arcstat/arcstat.py
    	cmd/dbufstat/Makefile.am
    	cmd/dbufstat/Makefile.in
    	cmd/fsck_zfs/Makefile.in
    	cmd/mount_zfs/Makefile.in
    	cmd/mount_zfs/mount_zfs.c
    	cmd/vdev_id/Makefile.in
    	cmd/zdb/Makefile.in
    	cmd/zdb/zdb.c
    	cmd/zdb/zdb_il.c
    	cmd/zed/Makefile.am
    	cmd/zed/Makefile.in
    	cmd/zed/zed.c
    	cmd/zed/zed.d/all-debug.sh
    	cmd/zed/zed.d/all-syslog.sh
    	cmd/zed/zed.d/checksum-spare.sh
    	cmd/zed/zed.d/io-spare.sh
    	cmd/zed/zed.d/zed.rc
    	cmd/zed/zed.h
    	cmd/zed/zed_conf.c
    	cmd/zed/zed_conf.h
    	cmd/zed/zed_event.c
    	cmd/zed/zed_event.h
    	cmd/zed/zed_exec.c
    	cmd/zed/zed_exec.h
    	cmd/zed/zed_file.c
    	cmd/zed/zed_file.h
    	cmd/zed/zed_log.c
    	cmd/zed/zed_log.h
    	cmd/zed/zed_strings.c
    	cmd/zed/zed_strings.h
    	cmd/zfs/Makefile.in
    	cmd/zfs/zfs_main.c
    	cmd/zhack/Makefile.in
    	cmd/zhack/zhack.c
    	cmd/zinject/Makefile.in
    	cmd/zpios/Makefile.in
    	cmd/zpool/Makefile.in
    	cmd/zpool/zpool_main.c
    	cmd/zstreamdump/Makefile.in
    	cmd/zstreamdump/zstreamdump.c
    	cmd/ztest/Makefile.in
    	cmd/ztest/ztest.c
    	cmd/zvol_id/Makefile.in
    	config/Rules.am
    	config/deb.am
    	config/kernel-bdi-setup-and-register.m4
    	config/kernel-blk-end-request.m4
    	config/kernel-blk-rq-bytes.m4
    	config/kernel-rq-for-each_segment.m4
    	config/kernel.m4
    	config/mount-helper.m4
    	config/zfs-build.m4
    	configure
    	configure.ac
    	contrib/Makefile.am
    	contrib/Makefile.in
    	contrib/bash_completion.d/Makefile.in
    	contrib/dracut/90zfs/Makefile.in
    	contrib/dracut/90zfs/module-setup.sh.in
    	contrib/dracut/90zfs/parse-zfs.sh.in
    	contrib/dracut/Makefile.in
    	contrib/dracut/README.dracut.markdown
    	dracut/90zfs/Makefile.am
    	dracut/90zfs/mount-zfs.sh.in
    	etc/Makefile.in
    	etc/init.d/Makefile.am
    	etc/init.d/Makefile.in
    	etc/init.d/zfs.fedora.in
    	etc/init.d/zfs.gentoo.in
    	etc/init.d/zfs.lsb.in
    	etc/init.d/zfs.lunar.in
    	etc/init.d/zfs.redhat.in
    	etc/modules-load.d/Makefile.am
    	etc/modules-load.d/Makefile.in
    	etc/systemd/Makefile.in
    	etc/systemd/system/Makefile.am
    	etc/systemd/system/Makefile.in
    	etc/zfs/Makefile.in
    	include/Makefile.in
    	include/libzfs.h
    	include/libzfs_core.h
    	include/linux/Makefile.am
    	include/linux/Makefile.in
    	include/linux/blkdev_compat.h
    	include/linux/vfs_compat.h
    	include/sys/Makefile.am
    	include/sys/Makefile.in
    	include/sys/arc.h
    	include/sys/arc_impl.h
    	include/sys/dbuf.h
    	include/sys/dmu.h
    	include/sys/dmu_objset.h
    	include/sys/dmu_send.h
    	include/sys/dnode.h
    	include/sys/dsl_dataset.h
    	include/sys/dsl_dir.h
    	include/sys/dsl_pool.h
    	include/sys/dsl_synctask.h
    	include/sys/fm/Makefile.in
    	include/sys/fm/fs/Makefile.in
    	include/sys/fs/Makefile.in
    	include/sys/fs/zfs.h
    	include/sys/mntent.h
    	include/sys/rrwlock.h
    	include/sys/sa_impl.h
    	include/sys/spa.h
    	include/sys/spa_impl.h
    	include/sys/trace_acl.h
    	include/sys/trace_arc.h
    	include/sys/trace_dbgmsg.h
    	include/sys/trace_dbuf.h
    	include/sys/trace_dmu.h
    	include/sys/trace_dnode.h
    	include/sys/trace_txg.h
    	include/sys/trace_zil.h
    	include/sys/trace_zrlock.h
    	include/sys/vdev_impl.h
    	include/sys/zfs_context.h
    	include/sys/zfs_debug.h
    	include/sys/zfs_ioctl.h
    	include/sys/zfs_sa.h
    	include/sys/zfs_vfsops.h
    	include/sys/zfs_znode.h
    	include/sys/zio.h
    	include/sys/zpl.h
    	include/zfeature_common.h
    	lib/Makefile.in
    	lib/libavl/Makefile.in
    	lib/libefi/Makefile.am
    	lib/libefi/Makefile.in
    	lib/libefi/rdwr_efi.c
    	lib/libnvpair/Makefile.in
    	lib/libshare/Makefile.in
    	lib/libspl/Makefile.am
    	lib/libspl/Makefile.in
    	lib/libspl/asm-generic/Makefile.in
    	lib/libspl/asm-i386/Makefile.in
    	lib/libspl/asm-x86_64/Makefile.in
    	lib/libspl/include/Makefile.in
    	lib/libspl/include/ia32/Makefile.in
    	lib/libspl/include/ia32/sys/Makefile.in
    	lib/libspl/include/rpc/Makefile.in
    	lib/libspl/include/sys/Makefile.in
    	lib/libspl/include/sys/dktp/Makefile.in
    	lib/libspl/include/sys/sysevent/Makefile.in
    	lib/libspl/include/umem.h
    	lib/libspl/include/util/Makefile.in
    	lib/libunicode/Makefile.in
    	lib/libuutil/Makefile.in
    	lib/libzfs/Makefile.am
    	lib/libzfs/Makefile.in
    	lib/libzfs/libzfs.pc
    	lib/libzfs/libzfs_core.pc
    	lib/libzfs/libzfs_dataset.c
    	lib/libzfs/libzfs_iter.c
    	lib/libzfs/libzfs_sendrecv.c
    	lib/libzfs/libzfs_util.c
    	lib/libzfs_core/Makefile.am
    	lib/libzfs_core/Makefile.in
    	lib/libzfs_core/libzfs_core.c
    	lib/libzpool/Makefile.am
    	lib/libzpool/Makefile.in
    	lib/libzpool/kernel.c
    	man/Makefile.in
    	man/man1/Makefile.in
    	man/man5/Makefile.in
    	man/man5/vdev_id.conf.5
    	man/man5/zfs-events.5
    	man/man5/zfs-module-parameters.5
    	man/man5/zpool-features.5
    	man/man8/Makefile.in
    	man/man8/mount.zfs.8
    	man/man8/zed.8.in
    	man/man8/zfs.8
    	man/man8/zpool.8
    	module/zcommon/zfs_uio.c
    	module/zcommon/zpool_prop.c
    	module/zfs/Makefile.in
    	module/zfs/arc.c
    	module/zfs/bpobj.c
    	module/zfs/dbuf.c
    	module/zfs/dbuf_stats.c
    	module/zfs/ddt.c
    	module/zfs/dmu.c
    	module/zfs/dmu_diff.c
    	module/zfs/dmu_objset.c
    	module/zfs/dmu_send.c
    	module/zfs/dmu_traverse.c
    	module/zfs/dmu_tx.c
    	module/zfs/dnode.c
    	module/zfs/dnode_sync.c
    	module/zfs/dsl_bookmark.c
    	module/zfs/dsl_dataset.c
    	module/zfs/dsl_deleg.c
    	module/zfs/dsl_destroy.c
    	module/zfs/dsl_dir.c
    	module/zfs/dsl_pool.c
    	module/zfs/dsl_prop.c
    	module/zfs/dsl_scan.c
    	module/zfs/dsl_synctask.c
    	module/zfs/dsl_userhold.c
    	module/zfs/fm.c
    	module/zfs/metaslab.c
    	module/zfs/range_tree.c
    	module/zfs/rrwlock.c
    	module/zfs/sa.c
    	module/zfs/spa.c
    	module/zfs/spa_config.c
    	module/zfs/spa_history.c
    	module/zfs/spa_misc.c
    	module/zfs/spa_stats.c
    	module/zfs/trace.c
    	module/zfs/uberblock.c
    	module/zfs/vdev.c
    	module/zfs/vdev_disk.c
    	module/zfs/vdev_file.c
    	module/zfs/vdev_mirror.c
    	module/zfs/vdev_missing.c
    	module/zfs/vdev_queue.c
    	module/zfs/vdev_raidz.c
    	module/zfs/zap.c
    	module/zfs/zap_leaf.c
    	module/zfs/zap_micro.c
    	module/zfs/zfeature_common.c
    	module/zfs/zfs_ctldir.c
    	module/zfs/zfs_debug.c
    	module/zfs/zfs_ioctl.c
    	module/zfs/zfs_onexit.c
    	module/zfs/zfs_vfsops.c
    	module/zfs/zfs_vnops.c
    	module/zfs/zfs_znode.c
    	module/zfs/zil.c
    	module/zfs/zio.c
    	module/zfs/zpl_ctldir.c
    	module/zfs/zpl_export.c
    	module/zfs/zpl_file.c
    	module/zfs/zpl_inode.c
    	module/zfs/zpl_super.c
    	module/zfs/zvol.c
    	module/zpios/pios.c
    	rpm/Makefile.in
    	rpm/generic/Makefile.in
    	rpm/generic/zfs-dkms.spec.in
    	rpm/generic/zfs-kmod.spec.in
    	rpm/generic/zfs.spec.in
    	rpm/redhat/Makefile.in
    	rpm/redhat/zfs-dkms.spec.in
    	rpm/redhat/zfs.spec.in
    	scripts/Makefile.am
    	scripts/Makefile.in
    	scripts/zpios-profile/Makefile.in
    	scripts/zpios-test/Makefile.in
    	scripts/zpool-config/Makefile.in
    	udev/Makefile.in
    	udev/rules.d/Makefile.in
    	zfs_config.h.in


-- 
ZFS on Linux



More information about the Pkg-zfsonlinux-devel mailing list