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)
commit2e4ceed606ba4942f632d097f70696543fe98d8e
tree9fa08d8b48c2988bcf89e1f2ab5d8e9eb6eb461c
parent7178a107f5ea7bdb1cc23073234f0ded0ef90ec7
parentbd9dcef67ffcae2de49e319fba349df76472fd10
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