Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

config/zfs-build.m4

@@ -20,15 +20,21 @@ AC_DEFUN([ZFS_AC_DEBUG], [
 )
 if test "$zfs_ac_debug" = yes; then
 	AC_MSG_RESULT([yes])
+		AC_DEFINE([DEBUG], [1],
+		[Define to 1 to enable debug tracing])
 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
+		USERDEBUG="-DDEBUG"
 	else
 		AC_MSG_RESULT([no])
 		AC_DEFINE([NDEBUG], [1],
 		[Define to 1 to disable debug tracing])
 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
+		USERDEBUG="-DNDEBUG"
 	fi
+
+	AC_SUBST(USERDEBUG)
 ])
 
 AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [

scripts/zpool-create.sh

@@ -24,10 +24,10 @@ DESCRIPTION:
 OPTIONS:
         -h      Show this message
         -v      Verbose
+        -f      Force everything
         -c      Configuration for zpool
         -p      Name for zpool
         -d      Destroy zpool (default create)
-        -f      Force everything
         -l      Additional zpool options
         -s      Additional zfs options