Merge branch 'x86/core' into x86/build, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-10 20:48:12 +00:00 · 2018-10-05 11:27:23 +02:00 · 2018-10-05 11:27:23 +02:00 · bce6824cc8
commit bce6824cc8
parent 494b5168f2 c0554d2d3d
42 changed files with 475 additions and 246 deletions
--- a/Documentation/fb/uvesafb.txt
+++ b/Documentation/fb/uvesafb.txt
--- a/4
+++ b/4
--- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
--- a/arch/x86/include/asm/extable.h
+++ b/arch/x86/include/asm/extable.h
--- a/arch/x86/include/asm/fpu/internal.h
+++ b/arch/x86/include/asm/fpu/internal.h
--- a/arch/x86/include/asm/futex.h
+++ b/arch/x86/include/asm/futex.h
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
--- a/arch/x86/lib/checksum_32.S
+++ b/arch/x86/lib/checksum_32.S
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
--- a/arch/x86/lib/csum-copy_64.S
+++ b/arch/x86/lib/csum-copy_64.S
--- a/arch/x86/lib/getuser.S
+++ b/arch/x86/lib/getuser.S
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
--- a/drivers/misc/lkdtm/core.c
+++ b/drivers/misc/lkdtm/core.c
--- a/drivers/misc/lkdtm/lkdtm.h
+++ b/drivers/misc/lkdtm/lkdtm.h
--- a/drivers/misc/lkdtm/usercopy.c
+++ b/drivers/misc/lkdtm/usercopy.c
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
--- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
--- a/drivers/soc/fsl/qe/ucc.c
+++ b/drivers/soc/fsl/qe/ucc.c
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
--- a/drivers/video/fbdev/pxa168fb.c
+++ b/drivers/video/fbdev/pxa168fb.c
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
--- a/fs/namespace.c
+++ b/fs/namespace.c
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/mm/maccess.c
+++ b/mm/maccess.c