I'm in the US, so getting a non-plus FP6 might be a bit difficult, but the FP6+ was just released in the US.

How much of the FP6 mainlining work applies to the FP6+?

And good to hear about the open nature of the potential WIP RISC-V phone. I love to hear it.