From 43f9f512d1eb0a354c90dab5728eb11cdf3485a3 Mon Sep 17 00:00:00 2001
From: Tim Chase <tim@chase2k.com>
Date: Fri, 31 May 2013 22:03:00 -0500
Subject: [PATCH] Enable the call to zpool_log_history in upgrade_cb since this
 branch is merging 4445fff.

---
 cmd/zpool/zpool_main.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index d27f6e1b50e2..8f18de091bbe 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -4464,13 +4464,6 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
 			return (ret);
 		printnl = B_TRUE;
 
-#if 0
-		/*
-		 * XXX: This code can be enabled when Illumos commit
-		 * 4445fffbbb1ea25fd0e9ea68b9380dd7a6709025 is merged.
-		 * It reworks the history logging among other things.
-		 */
-
 		/*
 		 * If they did "zpool upgrade -a", then we could
 		 * be doing ioctls to different pools.  We need
@@ -4479,7 +4472,6 @@ upgrade_cb(zpool_handle_t *zhp, void *arg)
 		 */
 		(void) zpool_log_history(g_zfs, history_str);
 		log_history = B_FALSE;
-#endif
 	}
 
 	if (cbp->cb_version >= SPA_VERSION_FEATURES) {