Merge commit '9bba04fed2291aa884d1da64bc62150d5562cc5b'
commitbe27e12fa80e9970e378e04a2488342fdbefac7a
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 20 Aug 2018 15:36:38 +0000 (20 11:36 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 20 Aug 2018 15:36:38 +0000 (20 11:36 -0400)
tree81602dabaa431417511f820f8d87cf81ff698779
parent821df39ddb2e42b34e72f0ccf7f8dac631441838
parent9bba04fed2291aa884d1da64bc62150d5562cc5b
Merge commit '9bba04fed2291aa884d1da64bc62150d5562cc5b'
35 files changed:
include/netinet/ip_compat.h
include/netinet/ip_fil.h
include/netinet/ip_nat.h
include/netinet/ip_proxy.h
include/regexp.h
kernel/drivers/net/mii/mii.c
kernel/drivers/net/nxge/npi/npi_mac.c
kernel/drivers/net/nxge/npi/npi_vir.c
kernel/drivers/net/nxge/nxge_zcp.c
kernel/fs/zfs/common/zfeature_common.c
kernel/fs/zfs/common/zfeature_common.h
kernel/fs/zfs/metaslab.c
kernel/fs/zfs/range_tree.c
kernel/fs/zfs/spa_checkpoint.c
kernel/fs/zfs/space_map.c
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/sys/space_map.h
kernel/fs/zfs/vdev.c
kernel/fs/zfs/vdev_indirect.c
kernel/fs/zfs/vdev_indirect_mapping.c
kernel/net/ipf/ip_log.c
kernel/net/ipf/opts.h
share/man/man5/zpool-features.5
share/man/man8/zfs.8
usr/src/cmd/cmd-inet/usr.bin/pppdump/zlib.c
usr/src/cmd/ipf/tools/ip_fil.c
usr/src/cmd/ipf/tools/ipmon.c
usr/src/cmd/mdb/common/modules/zfs/zfs.c
usr/src/cmd/zdb/zdb.c
usr/src/cmd/ztest/ztest.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/uts/common/c2/audit_start.c
usr/src/uts/common/io/ib/ibnex/ibnex_ioctl.c