OpenZFS imports, status update

[Martin Matuska]

Hi Warner,

thank you very much for the update.

If I understand this correctly, the way to go in the future is a 1:1 
merge from openzfs/master to e.g. vendor/openzfs/master and from 
openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a 
second step a subtree merge from vendor/openzfs/* to main or stable/13?

Martin

On 22. 4. 2021 20:34, Warner Losh wrote:
> Hey Martin,
>
> I just wanted to let you know we've been working towards enabling 
> pushing vendor/openzfs/* branches. There's one big issue that needs to 
> be corrected. Currently, we'll do one email per revision hash on such 
> imports, so openzfs would generate ~10k emails, which would be 
> undesirable. Li Wen is working on enabling one email per push for 
> vendor/* which would eliminate this problem. We hope to be doing test 
> pushes to the testing repo early next week, and if all goes well 
> enabling this in production shortly after.
>
> IMHO, you've made a compelling case: the size is small, the coupling 
> between the projects is tight and we get some extra benefit from 
> having a finer-grained vendor branch that we import from. The plan to 
> import directly from vendor/openzfs/zfs-2.1 would normally be 
> concerning because it's not following the usual main -> stable/X 
> workflow. In this case, though, since upstream follows that workflow 
> we won't lose things that get pushed to stable/13 that aren't also 
> relevant to main. There's at least some configuration needed to allow 
> the merge commits to stable/13, but we're still working out the last 
> details.
>
> So we'll be good to go soon (1-2 weeks until you can land commits, I 
> think). Does that work for you?
>
> Warner
>