Merge commit 'ce1577b04976f1d8bb5f235b6eaaab15b46a3068'
commit3ee66ce979ccc2c65424b54cbfb7961d92c89785
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 22:07:33 +0000 (20 17:07 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 22:07:33 +0000 (20 17:07 -0500)
treefe55acbccedb25c8ae025a1f3c3f3d094bc430de
parent759550df5c5b6075bb214626e3b7f70c55cccd3d
parentce1577b04976f1d8bb5f235b6eaaab15b46a3068
Merge commit 'ce1577b04976f1d8bb5f235b6eaaab15b46a3068'
include/sys/fs/zfs.h
include/sys/sysevent/eventdefs.h
kernel/fs/zfs/dsl_scan.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_config.c
kernel/fs/zfs/spa_history.c
kernel/fs/zfs/sys/spa.h
kernel/fs/zfs/vdev.c