the following backport from the 0.8.3 queue should be what you are looking for:
https://github.com/zfsonlinux/zfs/pull/9776/commits/ed3d9f4420dcb04d2b78de4e4adb25797dc93b0d
it does not include/depend on either of the problematic commits, but does contain all known squashed follow-up fixes.
the following backport from the 0.8.3 queue should be what you are looking for:
https:/ /github. com/zfsonlinux/ zfs/pull/ 9776/commits/ ed3d9f4420dcb04 d2b78de4e4adb25 797dc93b0d
it does not include/depend on either of the problematic commits, but does contain all known squashed follow-up fixes.