| commit | c2da5bdc66a377f0b82ee959f19f5a6774706b83 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 26 17:12:12 2019 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 26 17:12:12 2019 -0800 |
| tree | e97326a86f335061666f799d80de86197d0b54c8 | |
| parent | 168829ad09ca9cdfdc664b2110d0e3569932c12d [diff] | |
| parent | 0bcd7762727dd8ba9b9b6f828e5a4cbd5da4f725 [diff] |
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