On 23/06/21 09:59, Marc Zyngier wrote:
> If there is a stable branch with this patch on it, I can take it in
> the kvmarm tree and fix it up myself. Otherwise, Paolo could take the
> stable branch at [1] (or even that particular commit which is right on
> top of v5.13-rc4) and do a similar fixup. Just let me know.

There's no super hurry, I can fix the semantic conflict when you send me 
the kvmarm pull request (which should be a matter of days anyway).

Paolo