diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-27 02:12:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-27 02:12:12 +0100 |
| commit | c2da5bdc66a377f0b82ee959f19f5a6774706b83 (patch) | |
| tree | e97326a86f335061666f799d80de86197d0b54c8 /kernel/locking/spinlock_debug.c | |
| parent | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86/iopl: Make 'struct tss_struct' constant size again (diff) | |
| download | linux-c2da5bdc66a377f0b82ee959f19f5a6774706b83.tar.xz linux-c2da5bdc66a377f0b82ee959f19f5a6774706b83.zip | |
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
Diffstat (limited to 'kernel/locking/spinlock_debug.c')
0 files changed, 0 insertions, 0 deletions