Merge branch into tip/master: 'x86/urgent'
# New commits in x86/urgent: dc84bc2a ("x86/mm/pat: Fix VM_PAT handling when fork() fails in copy_page_range()") 878477a5 ("x86/fpu: Update the outdated comment above fpstate_init_user()") 3181424a ("x86/early_printk: Add support for MMIO-based UARTs") 2c118f50 ("x86/dumpstack: Fix inaccurate unwinding from exception stacks due to misplaced assignment") 57e2428f ("x86/entry: Fix ORC unwinder for PUSH_REGS with save_ret=1") 2704ad55 ("x86/Kconfig: Fix lists in X86_EXTENDED_PLATFORM help text") 99bb1bd8 ("x86/Kconfig: Correct X86_X2APIC help text") c8c81458 ("x86/speculation: Remove the extra #ifdef around CALL_NOSPEC") de711563 ("x86/Kconfig: Document release year of glibc 2.3.3") d9f87802 ("x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32") 21d8fb8d ("x86/Kconfig: Document CONFIG_PCI_MMCONFIG") 4047e877 ("x86/Kconfig: Update lists in X86_EXTENDED_PLATFORM") e35e328d ("x86/Kconfig: Move all X86_EXTENDED_PLATFORM options together") 31be5041 ("x86/Kconfig: Always enable ARCH_SPARSEMEM_ENABLE") 9232c49f ("x86/Kconfig: Enable X86_X2APIC by default and improve help text") Signed-off-by:Ingo Molnar <mingo@kernel.org>
No related branches found
No related tags found
Showing
- Documentation/admin-guide/kernel-parameters.txt 8 additions, 1 deletionDocumentation/admin-guide/kernel-parameters.txt
- arch/x86/Kconfig 56 additions, 27 deletionsarch/x86/Kconfig
- arch/x86/entry/calling.h 2 additions, 0 deletionsarch/x86/entry/calling.h
- arch/x86/include/asm/nospec-branch.h 0 additions, 4 deletionsarch/x86/include/asm/nospec-branch.h
- arch/x86/kernel/dumpstack.c 2 additions, 3 deletionsarch/x86/kernel/dumpstack.c
- arch/x86/kernel/early_printk.c 44 additions, 1 deletionarch/x86/kernel/early_printk.c
- arch/x86/kernel/fpu/core.c 1 addition, 1 deletionarch/x86/kernel/fpu/core.c
- arch/x86/mm/pat/memtype.c 28 additions, 24 deletionsarch/x86/mm/pat/memtype.c
- include/linux/pgtable.h 22 additions, 6 deletionsinclude/linux/pgtable.h
- kernel/fork.c 4 additions, 0 deletionskernel/fork.c
- mm/memory.c 4 additions, 7 deletionsmm/memory.c
Loading
Please register or sign in to comment