Merge commit 'f864f99efe57685e1762590c1a880dd16bca6da9' into merges
commiteb74b5c69401228cd1c2f0455d698d7e6bd03fbf
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 16:52:34 +0000 (18 12:52 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 19:19:10 +0000 (18 15:19 -0400)
treebf5b30afad712cb759aa59dcd1e5856fe24a01e5
parent3dd9efefa5f44644122fd15edfbbfcd1cef1c7a9
parentf864f99efe57685e1762590c1a880dd16bca6da9
Merge commit 'f864f99efe57685e1762590c1a880dd16bca6da9' into merges
28 files changed:
kernel/fs/zfs/dmu_tx.c
kernel/fs/zfs/sys/dmu.h
kernel/fs/zfs/sys/dmu_tx.h
kernel/fs/zfs/zfs_vnops.c
kernel/fs/zfs/zil.c
share/man/man1/rm.1
usr/src/Targetdirs
usr/src/cmd/boot/bootadm/bootadm_loader.c
usr/src/cmd/mdb/Makefile.kmdb
usr/src/cmd/mdb/Makefile.libstand
usr/src/cmd/mdb/Makefile.libstandctf
usr/src/cmd/mdb/Makefile.module
usr/src/cmd/modload/Makefile
usr/src/cmd/modload/amd64/Makefile
usr/src/cmd/pbind/Makefile
usr/src/cmd/prtconf/Makefile
usr/src/cmd/psrset/Makefile
usr/src/cmd/swap/Makefile
usr/src/cmd/sysdef/Makefile
usr/src/cmd/whodo/Makefile
usr/src/cmd/whodo/amd64/Makefile
usr/src/pkg/manifests/system-core-os.mf
usr/src/uts/Makefile.targ
usr/src/uts/Makefile.uts
usr/src/uts/i86pc/dr/Makefile
usr/src/uts/i86pc/drmach_acpi/Makefile
usr/src/uts/intel/Makefile.intel
usr/src/uts/intel/ip/Makefile