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

[patchbot@xxxxxxx]

commit 890ceb9453171c85e881103e65dbb5cdcf81659e
Merge: 8d73459193ad5d3e6bd220f3092643f3b1e44df2 
1c3ed9c908732d19660fbe83580674d585464d4c
Author:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
AuthorDate: Tue Sep 28 12:51:00 2021 +0100
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Tue Sep 28 12:51:00 2021 +0100

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

 Config.mk                | 2 +-
 tools/libs/libs.mk       | 2 ++
 xen/arch/arm/tee/optee.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --cc Config.mk
index 82b0c7c227,e85bf18654..e7af4a402d
--- a/Config.mk
+++ b/Config.mk
@@@ -244,9 -244,9 +244,9 @@@ QEMU_TRADITIONAL_URL ?= git://xenbits.x
  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
  MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
  endif
 -OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
 +OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5
  QEMU_UPSTREAM_REVISION ?= master
- MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
+ MINIOS_UPSTREAM_REVISION ?= 9f09744aa3e5982a083ecf8e9cd2123f477081f9
  
  SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
  
--
generated by git-patchbot for /home/xen/git/xen.git#master