Merge branch 'x86/core' into x86/build, to avoid conflicts
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
- Documentation/fb/uvesafb.txt 3 additions, 2 deletionsDocumentation/fb/uvesafb.txt
- MAINTAINERS 2 additions, 2 deletionsMAINTAINERS
- arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts 2 additions, 0 deletionsarch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
- arch/arm/boot/dts/bcm63138.dtsi 8 additions, 6 deletionsarch/arm/boot/dts/bcm63138.dtsi
- arch/arm/boot/dts/stm32mp157c.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/stm32mp157c.dtsi
- arch/arm/boot/dts/sun8i-r40.dtsi 1 addition, 2 deletionsarch/arm/boot/dts/sun8i-r40.dtsi
- arch/arm64/kvm/guest.c 54 additions, 1 deletionarch/arm64/kvm/guest.c
- arch/arm64/mm/hugetlbpage.c 43 additions, 7 deletionsarch/arm64/mm/hugetlbpage.c
- arch/x86/include/asm/asm.h 8 additions, 2 deletionsarch/x86/include/asm/asm.h
- arch/x86/include/asm/extable.h 2 additions, 1 deletionarch/x86/include/asm/extable.h
- arch/x86/include/asm/fpu/internal.h 1 addition, 1 deletionarch/x86/include/asm/fpu/internal.h
- arch/x86/include/asm/futex.h 3 additions, 3 deletionsarch/x86/include/asm/futex.h
- arch/x86/include/asm/ptrace.h 2 additions, 0 deletionsarch/x86/include/asm/ptrace.h
- arch/x86/include/asm/uaccess.h 11 additions, 11 deletionsarch/x86/include/asm/uaccess.h
- arch/x86/kernel/cpu/mcheck/mce.c 1 addition, 1 deletionarch/x86/kernel/cpu/mcheck/mce.c
- arch/x86/kernel/kprobes/core.c 0 additions, 38 deletionsarch/x86/kernel/kprobes/core.c
- arch/x86/kernel/traps.c 13 additions, 3 deletionsarch/x86/kernel/traps.c
- arch/x86/lib/checksum_32.S 2 additions, 2 deletionsarch/x86/lib/checksum_32.S
- arch/x86/lib/copy_user_64.S 45 additions, 45 deletionsarch/x86/lib/copy_user_64.S
- arch/x86/lib/csum-copy_64.S 6 additions, 2 deletionsarch/x86/lib/csum-copy_64.S
Loading
Please register or sign in to comment