From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Nov 2019 01:12:12 +0000 (-0800)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.5-rc1~148
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c2da5bdc66a377f0b82ee959f19f5a6774706b83;p=users%2Fwilly%2Flinux.git

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 merge fix from Ingo Molnar:
 "I missed one other semantic conflict that can result in build failures
  on certain stripped down x86 32-bit configs, for example 32-bit
  'allnoconfig' where CONFIG_X86_IOPL_IOPERM gets turned off"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/iopl: Make 'struct tss_struct' constant size again
---

c2da5bdc66a377f0b82ee959f19f5a6774706b83