Merge commit '8fd2e913f04a71b9e820a088819d5b3d5205945b'
commit5812a50449b625e89f7ffa21602a766519d76d87
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 23 Jan 2018 20:53:05 +0000 (23 15:53 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 23 Jan 2018 20:53:05 +0000 (23 15:53 -0500)
treeec23c8dba18f458a3df82b4997c6cedec57512c1
parent87a73db24812e4cd6c4d34ce074a7e7c7b5f278e
parent8fd2e913f04a71b9e820a088819d5b3d5205945b
Merge commit '8fd2e913f04a71b9e820a088819d5b3d5205945b'
44 files changed:
include/sys/scsi/scsi_address.h
kernel/fs/lookup.c
kernel/fs/zfs/arc.c
kernel/fs/zfs/blkptr.c
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/dmu.c
kernel/fs/zfs/dsl_bookmark.c
kernel/fs/zfs/dsl_dataset.c
kernel/fs/zfs/sys/abd.h
kernel/fs/zfs/sys/blkptr.h
kernel/fs/zfs/sys/dsl_dataset.h
kernel/fs/zfs/zfs_ioctl.c
kernel/fs/zfs/zfs_vnops.c
kernel/fs/zfs/zvol.c
share/man/man1/xargs.1
share/man/man1m/zdb.1m
tools/nightly.1onbld
usr/src/cmd/fs.d/nfs/mount/Makefile
usr/src/cmd/fs.d/udfs/fsdb/Makefile
usr/src/cmd/fs.d/udfs/labelit/Makefile
usr/src/cmd/iconv/Makefile
usr/src/cmd/isns/isnsd/Makefile
usr/src/cmd/msgfmt/Makefile
usr/src/cmd/sgs/Makefile
usr/src/cmd/svc/svccfg/Makefile
usr/src/cmd/xargs/xargs.c
usr/src/cmd/zdb/zdb.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/auditd_plugins/binfile/binfile.c
usr/src/lib/fm/topo/modules/common/ses/ses.c
usr/src/lib/libc/port/inet/getifaddrs.c
usr/src/lib/libipsecutil/common/ipsec_util.c
usr/src/lib/libstmf/common/store.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/lib/libzfs/common/libzfs_mount.c
usr/src/lib/libzfs_core/common/libzfs_core.c
usr/src/tools/scripts/git-pbchk.py
usr/src/uts/common/idmap/idmap_kapi.c
usr/src/uts/common/io/mac/mac_client.c
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
usr/src/uts/i86pc/io/apix/apix.c
usr/src/uts/i86pc/io/pci/pci_tools.c
usr/src/uts/i86pc/io/pcplusmp/apic.c
usr/src/uts/intel/mac/Makefile