]> git.ipfire.org Git - people/arne_f/kernel.git/commit
projects / people / arne_f / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6c8103 90a6cd5)
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts
authorIngo Molnar <mingo@kernel.org>
Sat, 26 Aug 2017 07:19:13 +0000 (09:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 26 Aug 2017 07:19:13 +0000 (09:19 +0200)
commit413d63d71b222108d19703f3fd5cf9108652a730
tree4680de6aebb6430dc5f3d9327f86d65149e6b5aetree | snapshot
parentd6c8103b0265d8db30e20e948a4f06382bbdaea7commit | diff
parent90a6cd503982bfd33ce8c70eb49bd2dd33bc6325commit | diff
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts

Conflicts:
arch/x86/kernel/head64.c
arch/x86/mm/mmap.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
20 files changed:
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/include/asm/cpufeatures.h diff1 | diff2 | blob | history
arch/x86/include/asm/elf.h diff1 | diff2 | blob | history
arch/x86/include/asm/io.h diff1 | diff2 | blob | history
arch/x86/include/asm/mmu_context.h diff1 | diff2 | blob | history
arch/x86/include/asm/processor.h diff1 | diff2 | blob | history
arch/x86/kernel/acpi/boot.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/amd.c diff1 | diff2 | blob | history
arch/x86/kernel/head64.c diff1 | diff2 | blob | history
arch/x86/kernel/ksysfs.c diff1 | diff2 | blob | history
arch/x86/kvm/svm.c diff1 | diff2 | blob | history
arch/x86/kvm/vmx.c diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
arch/x86/mm/init.c diff1 | diff2 | blob | history
arch/x86/mm/mmap.c diff1 | diff2 | blob | history
drivers/iommu/amd_iommu.c diff1 | diff2 | blob | history
drivers/iommu/amd_iommu_init.c diff1 | diff2 | blob | history
include/linux/compiler-gcc.h diff1 | diff2 | blob | history
include/linux/compiler.h diff1 | diff2 | blob | history
include/linux/dma-mapping.h diff1 | diff2 | blob | history
Arne's tree of linux kernel.