OpenZFS branch tracking policy

[Martin Matuska]

Dear git working group,

OpenZFS 2.1 is approaching and there is an ongoing discussion between 
the ZFS developers regarding branch tracking.

What we want archieve:

FreeBSD main will be tracking the master branch of openzfs/zfs
FreeBSD stable/13 will be tracking the zfs-2.1-release and upcoming 
staging branches of openzfs/zfs (they always have continuous commits)

At the moment, I rsync changes from openzfs/zfs to our vendor/openfzfs 
and commit them.

The question is, if this is the correct way to do this?
OpenZFS uses git so we might skip vendor/openzfs and subtree merge 
directly from openzfs/master (and that way inherit all OpenZFS history) 
and openzfs/zfs-2.1-release. That would be way easier to manage and we 
can track and see "real" commits from OpenZFS.

The other way would be like now, keep two vendor branches and rsync, but 
that makes it harder to track.

I would be really happy for a decision so I can start merging 
zfs-2.1-release.

Best regards,
mm