[xen master] Merge remote-tracking branch 'origin/staging' into staging

[patchbot@xxxxxxx]

commit 03dc5f00f66e9c29afdfc9a72e4e6d70ea50b191
Merge: 726c78d14dfe6ec76f5e4c7756821a91f0a04b34 
11ba5cdb8489e4dfc1e50c948dba23cece559e77
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Jun 8 16:26:57 2020 +0100
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Mon Jun 8 16:26:57 2020 +0100

    Merge remote-tracking branch 'origin/staging' into staging

 docs/support-matrix-generate | 20 ++++++++++++--------
 xen/Rules.mk                 |  4 ++--
 xen/arch/arm/Makefile        |  4 +---
 xen/arch/x86/Makefile        |  4 +---
 4 files changed, 16 insertions(+), 16 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master