diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 08:02:46 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 08:02:46 -1000 |
| commit | 27c5a778dfe23d1de8d9ebfbc6a54595a79ac709 (patch) | |
| tree | bbce77c57c5b3d2693a1c724eccfecc0fcdb484d /net/ipv4/ip_gre.c | |
| parent | 4314daa55b4ddc2dc1c28a3835b484de33ffbfdd (diff) | |
| parent | 002b87d2aace62b4f3841c3aa43309d2380092be (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingol Molnar:
"Misc fixes:
- EFI crash fix
- Xen PV fixes
- do not allow PTI on 2-level 32-bit kernels for now
- documentation fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/APM: Fix build warning when PROC_FS is not enabled
Revert "x86/mm/legacy: Populate the user page-table with user pgd's"
x86/efi: Load fixmap GDT in efi_call_phys_epilog() before setting %cr3
x86/xen: Disable CPU0 hotplug for Xen PV
x86/EISA: Don't probe EISA bus for Xen PV guests
x86/doc: Fix Documentation/x86/earlyprintk.txt
Diffstat (limited to 'net/ipv4/ip_gre.c')
0 files changed, 0 insertions, 0 deletions