Illumos sync fixups

usr/src/cmd/mdb/common/mdb/mdb_print.c

@@ -2148,7 +2148,6 @@ cmd_print_tab_common(mdb_tab_cookie_t *mcp, uint_t flags, int argc,
 	 * already have in rid.
 	 */
 	return (mdb_tab_complete_member_by_id(mcp, rid, member));
-<<<<<<< HEAD
 
 }
 
@@ -2775,7 +2774,6 @@ enum {
 };
 
 int
-<<<<<<< HEAD
 cmd_printf_tab(mdb_tab_cookie_t *mcp, uint_t flags, int argc,
     const mdb_arg_t *argv)
 {
@@ -2821,8 +2819,6 @@ cmd_printf_tab(mdb_tab_cookie_t *mcp, uint_t flags, int argc,
 }
 
 int
-=======
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 cmd_printf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	char type[MDB_SYM_NAMLEN];
@@ -2843,11 +2839,7 @@ cmd_printf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if (argc == 0 || argv[0].a_type != MDB_TYPE_STRING) {
 		mdb_warn("expected a format string\n");
-<<<<<<< HEAD
 		return (DCMD_ABORT);
-=======
-		return (DCMD_USAGE);
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 	}
 
 	/*
@@ -2856,15 +2848,6 @@ cmd_printf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	 * subset of mdb_printf() format strings that we allow.
 	 */
 	fmt = argv[0].a_un.a_str;
-<<<<<<< HEAD
-=======
-	/*
-	 * 'dest' must be large enough to hold a copy of the format string,
-	 * plus a NUL and up to 2 additional characters for each conversion
-	 * in the format string.  This gives us a bloat factor of 5/2 ~= 3.
-	 *   e.g. "%d" (strlen of 2) --> "%lld\0" (need 5 bytes)
-	 */
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 	dest = mdb_zalloc(strlen(fmt) * 3, UM_SLEEP | UM_GC);
 	fmts = mdb_zalloc(strlen(fmt) * sizeof (char *), UM_SLEEP | UM_GC);
 	funcs = mdb_zalloc(strlen(fmt) * sizeof (void *), UM_SLEEP | UM_GC);
@@ -2931,10 +2914,7 @@ cmd_printf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			funcs[nfmts] = printf_ipv6;
 			break;
 
-<<<<<<< HEAD
 		case 'H':
-=======
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 		case 'o':
 		case 'r':
 		case 'u':
@@ -3050,7 +3030,6 @@ static char _mdb_printf_help[] =
 "\n"
 "  %%    Prints the '%' symbol.\n"
 "  %a    Prints the member in symbolic form.\n"
-<<<<<<< HEAD
 "  %d    Prints the member as a decimal integer. If the member is a signed\n"
 "        integer type, the output will be signed.\n"
 "  %H    Prints the member as a human-readable size.\n"
@@ -3061,27 +3040,12 @@ static char _mdb_printf_help[] =
 "  %q    Prints the member in signed octal. Honk if you ever use this!\n"
 "  %r    Prints the member as an unsigned value in the current output radix. \n"
 "  %R    Prints the member as a signed value in the current output radix. \n"
-=======
-"  %d    Prints the member as a decimal integer.  If the member is a signed\n"
-"        integer type, the output will be signed.\n"
-"  %I    Prints the member a IPv4 address (must be a 32-bit integer type).\n"
-"  %N    Prints the member an IPv6 address (must be of type in6_addr_t).\n"
-"  %o    Prints the member as an unsigned octal integer.\n"
-"  %p    Prints the member as a pointer, in hexadecimal.\n"
-"  %q    Prints the member in signed octal.  Honk if you ever use this!\n"
-"  %r    Prints the member as an unsigned value in the current output radix.\n"
-"  %R    Prints the member as a signed value in the current output radix.\n"
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 "  %s    Prints the member as a string (requires a pointer or an array of\n"
 "        characters).\n"
 "  %u    Prints the member as an unsigned decimal integer.\n"
 "  %x    Prints the member in hexadecimal.\n"
 "  %X    Prints the member in hexadecimal, using the characters A-F as the\n"
-<<<<<<< HEAD
 "        digits for the values 10-15. \n"
-=======
-"        digits for the values 10-15.\n"
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 "  %Y    Prints the member as a time_t as the string "
 	    "'year month day HH:MM:SS'.\n"
 "\n"
@@ -3094,23 +3058,13 @@ static char _mdb_printf_help[] =
 "\n"
 "The following flag specifers are recognized by ::printf:\n"
 "\n"
-<<<<<<< HEAD
 "  %-    Left-justify the output within the specified field width. If the\n"
 "        width of the output is less than the specified field width, the\n"
 "        output will be padded with blanks on the right-hand side. Without\n"
 "        %-, values are right-justified by default.\n"
 "\n"
 "  %0    Zero-fill the output field if the output is right-justified and the\n"
 "        width of the output is less than the specified field width. Without\n"
-=======
-"  %-    Left-justify the output within the specified field width.  If the\n"
-"        width of the output is less than the specified field width, the\n"
-"        output will be padded with blanks on the right-hand side.  Without\n"
-"        %-, values are right-justified by default.\n"
-"\n"
-"  %0    Zero-fill the output field if the output is right-justified and the\n"
-"        width of the output is less than the specified field width.  Without\n"
->>>>>>> 5ada8a07255938930de285f1d55b0ef0bdba90ff
 "        %0, right-justified values are prepended with blanks in order to\n"
 "        fill the field.\n"
 "\n"

usr/src/cmd/zpool/zpool_main.c

@@ -4941,7 +4941,7 @@ get_callback(zpool_handle_t *zhp, void *data)
 			}
 		} else {
 			if (zpool_get_prop(zhp, pl->pl_prop, value,
-			    sizeof (value), &srctype) != 0)
+			    sizeof (value), &srctype, cbp->cb_literal) != 0)
 				continue;
 
 			zprop_print_one_property(zpool_get_name(zhp), cbp,

usr/src/uts/common/sys/dtrace.h

@@ -1020,8 +1020,8 @@ extern "C" {
 #define	DTRACEOPT_AGGSORTPOS	25	/* agg. position to sort on */
 #define	DTRACEOPT_AGGSORTKEYPOS	26	/* agg. key position to sort on */
 #define	DTRACEOPT_TEMPORAL	27	/* temporally ordered output */
-#define	DTRACEOPT_MAX		28	/* number of options */
-#define	DTRACEOPT_ZONE		29	/* zone in which to enable probes */
+#define	DTRACEOPT_ZONE		28	/* zone in which to enable probes */
+#define	DTRACEOPT_MAX		29	/* number of options */
 
 #define	DTRACEOPT_UNSET		(dtrace_optval_t)-2	/* unset option */