Merge tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jan 2021 19:46:38 +0000 (11:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jan 2021 19:46:38 +0000 (11:46 -0800)
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


Trivial merge