2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>

*** 19,32 ****
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
- #
- 
- #
  # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  #
  
  #
  # This Makefile defines all file modules for the directory uts/common
  # and its children. These are the source files which may be considered
--- 19,30 ----
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
  #
  # This Makefile defines all file modules for the directory uts/common
  # and its children. These are the source files which may be considered
*** 243,252 ****
--- 241,251 ----
                  netstack.o      \
                  ntptime.o       \
                  nvpair.o        \
                  nvpair_alloc_system.o   \
                  nvpair_alloc_fixed.o    \
+                 fnvpair.o       \
                  octet.o         \
                  open.o          \
                  p_online.o      \
                  pathconf.o      \
                  pathname.o      \
*** 1328,1337 ****
--- 1327,1337 ----
  
  ZFS_COMMON_OBJS +=              \
          arc.o                   \
          bplist.o                \
          bpobj.o                 \
+         bptree.o                \
          dbuf.o                  \
          ddt.o                   \
          ddt_zap.o               \
          dmu.o                   \
          dmu_diff.o              \
*** 1349,1358 ****
--- 1349,1359 ----
          dsl_synctask.o          \
          dmu_zfetch.o            \
          dsl_deleg.o             \
          dsl_prop.o              \
          dsl_scan.o              \
+         zfeature.o              \
          gzip.o                  \
          lzjb.o                  \
          metaslab.o              \
          refcount.o              \
          sa.o                    \
*** 1391,1405 ****
          zio_inject.o            \
          zle.o                   \
          zrlock.o
  
  ZFS_SHARED_OBJS +=              \
!         zfs_namecheck.o         \
!         zfs_deleg.o             \
!         zfs_prop.o              \
          zfs_comutil.o           \
          zfs_fletcher.o          \
          zpool_prop.o            \
          zprop_common.o
  
  ZFS_OBJS +=                     \
          $(ZFS_COMMON_OBJS)      \
--- 1392,1407 ----
          zio_inject.o            \
          zle.o                   \
          zrlock.o
  
  ZFS_SHARED_OBJS +=              \
!         zfeature_common.o       \
          zfs_comutil.o           \
+         zfs_deleg.o             \
          zfs_fletcher.o          \
+         zfs_namecheck.o         \
+         zfs_prop.o              \
          zpool_prop.o            \
          zprop_common.o
  
  ZFS_OBJS +=                     \
          $(ZFS_COMMON_OBJS)      \