Merge branch 'linus' into x86/fpu
Resolve semantic conflict in arch/x86/kvm/cpuid.c with: c447e76b ("kvm/fpu: Enable eager restore kvm FPU for MPX") By removing the FPU internal include files. Signed-off-by:Ingo Molnar <mingo@kernel.org>
Showing
- Documentation/devicetree/bindings/clock/silabs,si5351.txt 3 additions, 1 deletionDocumentation/devicetree/bindings/clock/silabs,si5351.txt
- Documentation/devicetree/bindings/net/cdns-emac.txt 2 additions, 1 deletionDocumentation/devicetree/bindings/net/cdns-emac.txt
- Documentation/virtual/kvm/mmu.txt 14 additions, 4 deletionsDocumentation/virtual/kvm/mmu.txt
- MAINTAINERS 9 additions, 6 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/boot/dts/zynq-7000.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/zynq-7000.dtsi
- arch/arm/xen/enlighten.c 1 addition, 0 deletionsarch/arm/xen/enlighten.c
- arch/powerpc/kernel/mce.c 2 additions, 2 deletionsarch/powerpc/kernel/mce.c
- arch/powerpc/kernel/vmlinux.lds.S 1 addition, 0 deletionsarch/powerpc/kernel/vmlinux.lds.S
- arch/powerpc/kvm/book3s_hv.c 3 additions, 2 deletionsarch/powerpc/kvm/book3s_hv.c
- arch/powerpc/mm/hugetlbpage.c 16 additions, 9 deletionsarch/powerpc/mm/hugetlbpage.c
- arch/powerpc/mm/pgtable_64.c 11 additions, 0 deletionsarch/powerpc/mm/pgtable_64.c
- arch/s390/crypto/ghash_s390.c 13 additions, 12 deletionsarch/s390/crypto/ghash_s390.c
- arch/s390/crypto/prng.c 1 addition, 1 deletionarch/s390/crypto/prng.c
- arch/s390/include/asm/pgtable.h 1 addition, 1 deletionarch/s390/include/asm/pgtable.h
- arch/s390/net/bpf_jit_comp.c 10 additions, 9 deletionsarch/s390/net/bpf_jit_comp.c
- arch/x86/include/asm/kvm_host.h 3 additions, 0 deletionsarch/x86/include/asm/kvm_host.h
- arch/x86/kvm/cpuid.c 2 additions, 0 deletionsarch/x86/kvm/cpuid.c
- arch/x86/kvm/cpuid.h 8 additions, 0 deletionsarch/x86/kvm/cpuid.h
- arch/x86/kvm/mmu.c 12 additions, 4 deletionsarch/x86/kvm/mmu.c
Please register or sign in to comment