delphiX-4.1 last common ancestor from upstream 'illumos-gate/master'

last-common-ancestor-delphiX-4.1.TXT

Feb 19, 2014
Basil Crow 	basil 	Merge remote-tracking branch 'illumos-gate/master' … 	3911d0b

we are closer to home on 4.1 than 4.0 was..
ALL future development henceforth shall track Delphix 4.1 in addition to upstream changes and OpenIndiana illumos-gate

$ date
Sun Jul 27 08:31:56 PHT 2014
_____________________________________________
_____________________________________________

Conflicts:
	usr/src/cmd/cmd-crypto/Makefile
	usr/src/cmd/fs.d/nfs/mountd/mountd.c
	usr/src/cmd/ipdadm/Makefile
	usr/src/cmd/ipdadm/ipdadm.c
	usr/src/cmd/mdb/common/modules/zfs/zfs.c
	usr/src/cmd/ndmpd/ndmp/Makefile.rpcgen
	usr/src/cmd/ndmpd/ndmp/ndmpd.h
	usr/src/cmd/ndmpd/ndmp/ndmpd_callbacks.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_config.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_connect.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_mover.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_tape.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_tar.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_tar3.c
	usr/src/cmd/ndmpd/ndmp/ndmpd_util.c
	usr/src/cmd/ndmpd/tlm/tlm_restore_writer.c
	usr/src/cmd/zdb/zdb.c
	usr/src/cmd/zfs/zfs_iter.c
	usr/src/cmd/zfs/zfs_main.c
	usr/src/cmd/zpool/zpool_main.c
	usr/src/cmd/zstreamdump/zstreamdump.c
	usr/src/common/zfs/zfeature_common.c
	usr/src/common/zfs/zfeature_common.h
	usr/src/grub/capability
	usr/src/grub/grub-0.97/stage2/fsys_zfs.c
	usr/src/grub/grub-0.97/stage2/zfs-include/spa.h
	usr/src/lib/libipd/Makefile
	usr/src/lib/libipd/Makefile.com
	usr/src/lib/libndmp/common/ndmp_handler.c
	usr/src/lib/libzfs/common/libzfs.h
	usr/src/lib/libzfs/common/libzfs_dataset.c
	usr/src/lib/libzfs/common/libzfs_pool.c
	usr/src/lib/libzfs/common/libzfs_sendrecv.c
	usr/src/lib/libzfs_core/common/libzfs_core.c
	usr/src/lib/libzfs_core/common/libzfs_core.h
	usr/src/lib/libzpool/common/kernel.c
	usr/src/man/man1m/zfs.1m
	usr/src/man/man5/zpool-features.5
	usr/src/pkg/manifests/SUNWcs.mf
	usr/src/pkg/manifests/network-ipd.mf
	usr/src/pkg/manifests/system-library.mf
	usr/src/pkg/manifests/system-test-zfstest.mf
	usr/src/test/zfs-tests/runfiles/delphix.run
	usr/src/test/zfs-tests/runfiles/openindiana.run
	usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
	usr/src/test/zfs-tests/tests/functional/refquota/Makefile
	usr/src/uts/common/Makefile.files
	usr/src/uts/common/Makefile.rules
	usr/src/uts/common/fs/vnode.c
	usr/src/uts/common/fs/zfs/arc.c
	usr/src/uts/common/fs/zfs/bptree.c
	usr/src/uts/common/fs/zfs/dbuf.c
	usr/src/uts/common/fs/zfs/dmu_diff.c
	usr/src/uts/common/fs/zfs/dmu_send.c
	usr/src/uts/common/fs/zfs/dmu_traverse.c
	usr/src/uts/common/fs/zfs/dnode_sync.c
	usr/src/uts/common/fs/zfs/dsl_destroy.c
	usr/src/uts/common/fs/zfs/dsl_pool.c
	usr/src/uts/common/fs/zfs/dsl_scan.c
	usr/src/uts/common/fs/zfs/metaslab.c
	usr/src/uts/common/fs/zfs/range_tree.c
	usr/src/uts/common/fs/zfs/spa.c
	usr/src/uts/common/fs/zfs/space_map.c
	usr/src/uts/common/fs/zfs/sys/dmu_impl.h
	usr/src/uts/common/fs/zfs/sys/dsl_dataset.h
	usr/src/uts/common/fs/zfs/sys/metaslab.h
	usr/src/uts/common/fs/zfs/sys/metaslab_impl.h
	usr/src/uts/common/fs/zfs/sys/range_tree.h
	usr/src/uts/common/fs/zfs/sys/spa.h
	usr/src/uts/common/fs/zfs/sys/spa_impl.h
	usr/src/uts/common/fs/zfs/sys/space_map.h
	usr/src/uts/common/fs/zfs/sys/zfs_debug.h
	usr/src/uts/common/fs/zfs/vdev.c
	usr/src/uts/common/fs/zfs/zio.c
	usr/src/uts/common/inet/ip/ip.c
	usr/src/uts/common/inet/ipd/ipd.c
	usr/src/uts/common/inet/ipd/ipd.conf
	usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
	usr/src/uts/common/io/comstar/port/iscsit/iscsit.h
	usr/src/uts/common/io/comstar/port/iscsit/iscsit_login.c
	usr/src/uts/common/klm/nlm_impl.c
	usr/src/uts/common/sys/ipd.h
	usr/src/uts/common/sys/vnode.h
	usr/src/uts/intel/Makefile.files
	usr/src/uts/intel/Makefile.intel.shared
	usr/src/uts/intel/ipd/Makefile

prototypes based on Delphix 4.0 would have to be rebased onto newly-plucked Delphix 4.1 branch
advantages include being closer to source upstream in 'illumos-gate/master' and cleaner code integration implemented.. preliminary efforts here

compare Delphix OS 4.0 --> 4.1:
last common ancestor from vanilla illumos-gate was pulled Feb 19 (197c952) it contains 2010-2014 contribs from Nexenta!

basil Crow merged(3911d0b): 947884f + 197c952 on Feb 20

Conflicts above are parallel to milestones hit at the same time period February to May 2014, including pertinent changes in OpenIndiana and dilOS/OpenSXCE builds, it will be easier to integrate those changes upon rebase, overlapping and/OR conflicting implementations needed to be reviewed, including interesting innovations from individual independent contributors, minor distros as well as Nexenta, Joyent and Delphix..

interesting year ahead!