It seems xfs on linux has a new upstream (AFAICT): https://github.com/zfsonlinux/zfs/releases Maybe rebase from the current release onto the newer 0.7.x series from this upstream?
No, this is the out-of-tree kernel module, still under the CDDL.