From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 05:58:12 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fbd68a3aa031cf3db8e58a2ecd91ca556fa3e5c8;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'kvm/next'

# Conflicts:
#	arch/x86/kvm/svm/nested.c
---

fbd68a3aa031cf3db8e58a2ecd91ca556fa3e5c8