Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch

Conflicts:
	lib/libzfs/libzfs_util.c

diff --cc lib/libzfs/libzfs_dataset.c
index 07d191dcbc13e976985f75485781c003c1d9e068,ab9ba6b80143bfb3336ec6f98ab7f96531a7c957..47c6276bc54acaf524d2ea6fadda9d31631c929b
--- 1/lib/libzfs/libzfs_dataset.c
--- 2/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@@ -1789,10 -1778,10 +1790,10 @@@ zfs_prop_get(zfs_handle_t *zhp, zfs_pro
                        struct tm t;
  
                        if (literal ||
-                           localtime_r(&local_time, &t) == NULL ||
+                           localtime_r(&time, &t) == NULL ||
                            strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
                            &t) == 0)
 -                              (void) snprintf(propbuf, proplen, "%llu", val);
 +                              (void) snprintf(propbuf, proplen, "%llu", (u_longlong_t) val);
                }
                break;
  

diff --cc lib/libzfs/libzfs_mount.c
Simple merge

diff --cc lib/libzfs/libzfs_sendrecv.c
Simple merge

diff --cc lib/libzfs/libzfs_util.c
index dfb24b32904c6ff7ac9def6431a1eae9afb8d833,4da0fb44b2c1aba95bcca3a42b9d165d0ebda26d..61966e074dec6d3d14bcacacc84906c909cf3700
--- 1/lib/libzfs/libzfs_util.c
--- 2/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@@ -531,14 -531,14 +531,14 @@@ zfs_nicenum(uint64_t num, char *buf, si
  
        while (n >= 1024) {
                n /= 1024;
-               i++;
+               index++;
        }
  
-       u = " KMGTPE"[i];
+       u = " KMGTPE"[index];
  
-       if (i == 0) {
+       if (index == 0) {
 -              (void) snprintf(buf, buflen, "%llu", n);
 +              (void) snprintf(buf, buflen, "%llu", (u_longlong_t) n);
-       } else if ((num & ((1ULL << 10 * i) - 1)) == 0) {
+       } else if ((num & ((1ULL << 10 * index) - 1)) == 0) {
                /*
                 * If this is an even multiple of the base, always display
                 * without any decimal precision.

diff --cc lib/libzpool/kernel.c
Simple merge

diff --cc lib/libzpool/util.c
Simple merge

diff --cc module/zcommon/zprop_common.c
Simple merge

diff --cc module/zfs/dmu.c
Simple merge

diff --cc module/zfs/dmu_objset.c
Simple merge

diff --cc module/zfs/dmu_zfetch.c
Simple merge

diff --cc module/zfs/dnode.c
Simple merge

diff --cc module/zfs/vdev_raidz.c
Simple merge