Could the pmOS folks get involved and start submitting mainline patches themselves? The Mobian folks might also be interested since they probably want to minimize long-term deviations from Debian, which is based on the mainline.
We're working together with the maintainers of various distros now to first of all avoid this mess on the pinephone pro, and then on the longer term fix up pinephone in mainline.
