6047 SPARC boot should support feature@embedded_data
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
5959 clean up per-dataset feature count code
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Alex Reece <alex@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
4370 avoid transmitting holes during zfs send
4371 DMU code clean up
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Garrett D'Amore <garrett@damore.org>
Fixup merge results
re 13748 added zpool export -c option
zpool export -c command exports specified pool while keeping its latest
configuration in the cache file for subsequent zpool import -c.

*** 88,98 ****
  {
          va_list ap;
  
          if (spa != NULL) {
                  spa_close(spa, tag);
!                 (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE);
          }
  
          va_start(ap, fmt);
          (void) fprintf(stderr, "%s: ", cmdname);
          (void) vfprintf(stderr, fmt, ap);
--- 88,98 ----
  {
          va_list ap;
  
          if (spa != NULL) {
                  spa_close(spa, tag);
!                 (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE, B_FALSE);
          }
  
          va_start(ap, fmt);
          (void) fprintf(stderr, "%s: ", cmdname);
          (void) vfprintf(stderr, fmt, ap);
*** 554,564 ****
                  (void) fprintf(stderr, "error: unknown subcommand: %s\n",
                      subcommand);
                  usage();
          }
  
!         if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_FALSE) != 0) {
                  fatal(NULL, FTAG, "pool export failed; "
                      "changes may not be committed to disk\n");
          }
  
          libzfs_fini(g_zfs);
--- 554,565 ----
                  (void) fprintf(stderr, "error: unknown subcommand: %s\n",
                      subcommand);
                  usage();
          }
  
!         if (!g_readonly &&
!             spa_export(g_pool, NULL, B_TRUE, B_TRUE, B_FALSE) != 0) {
                  fatal(NULL, FTAG, "pool export failed; "
                      "changes may not be committed to disk\n");
          }
  
          libzfs_fini(g_zfs);