From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jan 2021 19:46:38 +0000 (-0800)
Subject: Merge tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1954
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e4ceed606ba4942f632d097f70696543fe98d8e;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.11-rc5-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "A fix for build failure showing up in some configurations"

* tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: fix 'nopvspin' build error
---

2e4ceed606ba4942f632d097f70696543fe98d8e