Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source

Conflicts:
	cmd/zdb/zdb.c

diff --cc cmd/zdb/zdb.c
index a14c681a6e3280ebf064120a4789df237e7f4ae0,ff73072f8a64f5622c23cb5b2b3c625af3b9e9b4..3cc2eb86191ebb6a4230ea45a4476e7086d37084
--- 1/cmd/zdb/zdb.c
--- 2/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@@ -1939,7 -2532,7 +2532,7 @@@ zdb_dump_block_raw(void *buf, uint64_t 
  {
        if (flags & ZDB_FLAG_BSWAP)
                byteswap_uint64_array(buf, size);
-       VERIFY(write(fileno(stderr), buf, size) == size);
 -      (void) write(1, buf, size);
++      VERIFY(write(fileno(stdout), buf, size) == size);
  }
  
  static void

diff --cc cmd/ztest/ztest.c
Simple merge

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