Merge tag 'pull-xen-20220609' of https://xenbits.xen.org/git-http/people/aperard...