Merge commit '5f5913bb83405db87f982abee80162a479d363af'
commitb9f1ebc20caa43a24912fdcb592896b006524368
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 18 Aug 2018 15:38:44 +0000 (18 11:38 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 18 Aug 2018 15:38:44 +0000 (18 11:38 -0400)
tree641956eb1e43020f89faad0b9f8f5b27415377b3
parentb1da55c46fa159798398778829bdcc7fe0383ea1
parent5f5913bb83405db87f982abee80162a479d363af
Merge commit '5f5913bb83405db87f982abee80162a479d363af'
kernel/fs/zfs/dmu_objset.c
kernel/fs/zfs/sys/dmu_objset.h
kernel/fs/zfs/zfs_ioctl.c