Merge commit '3f7978d02b206a6ebc5652c91aa9f42da6fbe00c' into merges
commit54a8d45d5c2673f7db63e9ef6636b9ecb570a3ce
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 20:45:15 +0000 (13 16:45 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 20:58:37 +0000 (13 16:58 -0400)
treeccf910ec1ccb8e71585af83d6940450840912d3c
parentc7e6204ece352e8e19ee71ee8436ad6f82e863b3
parent3f7978d02b206a6ebc5652c91aa9f42da6fbe00c
Merge commit '3f7978d02b206a6ebc5652c91aa9f42da6fbe00c' into merges
43 files changed:
include/sys/ccompile.h
include/sys/cpuvar.h
include/sys/param.h
include/sys/stddef.h
kernel/drivers/net/ixgbe/core/README.illumos
kernel/drivers/net/ixgbe/core/ixgbe_common.c
kernel/drivers/net/ixgbe/core/ixgbe_common.h
kernel/drivers/net/ixgbe/ixgbe_osdep.c
kernel/drivers/net/ixgbe/ixgbe_osdep.h
kernel/drivers/net/ixgbe/ixgbe_stat.c
kernel/drivers/net/ixgbe/ixgbe_sw.h
kernel/drivers/net/wifi/iwn/if_iwncompat.h
kernel/fs/zfs/arc.c
kernel/fs/zfs/dbuf.c
kernel/fs/zfs/dsl_dataset.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/sys/dsl_dataset.h
kernel/fs/zfs/sys/refcount.h
kernel/fs/zfs/sys/sa.h
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/zcp.h
kernel/fs/zfs/sys/zil.h
kernel/fs/zfs/txg.c
kernel/fs/zfs/zcp.c
kernel/fs/zfs/zcp_global.c
kernel/fs/zfs/zcp_synctask.c
kernel/fs/zfs/zfs_ioctl.c
kernel/fs/zfs/zfs_replay.c
kernel/fs/zfs/zfs_vnops.c
kernel/fs/zfs/zil.c
kernel/fs/zfs/zvol.c
share/man/man8/zfs-program.8
usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c
usr/src/cmd/dladm/dladm.c
usr/src/cmd/zdb/Makefile.com
usr/src/cmd/zdb/zdb.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/libzfs/common/libzfs_mount.c
usr/src/lib/libzfs_core/common/libzfs_core.c
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/uts/common/io/nvme/nvme.c
usr/src/uts/i86pc/Makefile.rules