diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 19:21:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 19:21:54 +0300 |
| commit | fd2615908dfd0586ea40692a99c44e34b7e869bc (patch) | |
| tree | 7ef2d2163e11d9af526627f7d8a356d8cb212fba /net/smc/smc_ib.h | |
| parent | be2eca94d144e3ffed565c483a58ecc76a869c98 (diff) | |
| parent | 700c1018b86d0d4b3f1f2d459708c0cdf42b521d (diff) | |
| parent | b41d62201b9772c7c750360ab668d2caa502e642 (diff) | |
| parent | 2579a4eefc04d1c23eef8f3f0db3309f955e5792 (diff) | |
| download | linux-fd2615908dfd0586ea40692a99c44e34b7e869bc.tar.xz | |
Merge branches 'core-objtool-for-linus', 'x86-cleanups-for-linus' and 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 objtool, cleanup, and apic updates from Ingo Molnar:
"Objtool:
- Fix a gawk 5.0 incompatibility in gen-insn-attr-x86.awk. Most
distros are still on gawk 4.2.x.
Cleanup:
- Misc cleanups, plus the removal of obsolete code such as Calgary
IOMMU support, which code hasn't seen any real testing in a long
time and there's no known users left.
apic:
- Two changes: a cleanup and a fix for an (old) race for oneshot
threaded IRQ handlers"
* 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/insn: Fix awk regexp warnings
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Remove unused asm/rio.h
x86: Fix typos in comments
x86/pci: Remove #ifdef __KERNEL__ guard from <asm/pci.h>
x86/pci: Remove pci_64.h
x86: Remove the calgary IOMMU driver
x86/apic, x86/uprobes: Correct parameter names in kernel-doc comments
x86/kdump: Remove the unused crash_copy_backup_region()
x86/nmi: Remove stale EDAC include leftover
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ioapic: Rename misnamed functions
x86/ioapic: Prevent inconsistent state when moving an interrupt