01:35 <alyssa> lina: I'm not thrilled that it's come to this, but... https://gitlab.freedesktop.org/asahi/mesa/-/merge_requests

01:36 <alyssa> The way I envision this working is that any new Asahi work is MR'd against asahi/mesa

01:37 <alyssa> asahi/main is never* pushed to directly, any commits to it must go through the MR and review process undergoing a similar level of scrutiny to mesa/mesa (no HACKs, no WIPs, no FIXMEs, no NEEDSTESTs, no fixup!, you get the idea)

01:38 <alyssa> marcan: If we do CI properly, then asahi/main will always be healthy so you can cut a release "whenever" from asahi/main

01:38 <alyssa> No special branch for that. In particular, asahi/main contains the new UAPI work.

01:39 <alyssa> Once every 'some amount of time' (maybe weekly? maybe fortnightly?), asahi/main is MR'd against upstream mesa/mesa (with the UAPI commits dropped)

01:40 <alyssa> * but immediately before that happens, asahi/main is rebased on upstream and force-pushed. Ideally this happens when there are minimal outstanding MRs because force pushing makes a mess of MRs, but it's not the end of the world. We'll just have to be fast about review! :~P

01:41 <alyssa> This means for Asahi vendor stuff, we only interact with upstream CI once every 'some amount of time'

01:41 <alyssa> (Stuff that touches other parts of the tree obviously should get MR'd upstream earlier and split out from the bunch)