Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso

Resolved Conflicts: arch/x86/vdso/vdso32-setup.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2026-10-18 19:12:56 +00:00 · 2014-05-21 17:38:22 -07:00 · 2014-05-21 17:38:22 -07:00 · 94aca80897
commit 94aca80897
parent 03c1b4e8e5 368b69a5b0
195 changed files with 2274 additions and 1191 deletions
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
--- a/9
+++ b/9
--- a/2
+++ b/2
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
--- a/arch/arm/boot/dts/ste-ccu8540.dts
+++ b/arch/arm/boot/dts/ste-ccu8540.dts
--- a/arch/arm64/kernel/irq.c
+++ b/arch/arm64/kernel/irq.c
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
--- a/arch/ia64/include/uapi/asm/unistd.h
+++ b/arch/ia64/include/uapi/asm/unistd.h
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
--- a/arch/m68k/include/uapi/asm/unistd.h
+++ b/arch/m68k/include/uapi/asm/unistd.h
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
--- a/arch/metag/include/asm/barrier.h
+++ b/arch/metag/include/asm/barrier.h
--- a/arch/metag/include/asm/processor.h
+++ b/arch/metag/include/asm/processor.h
--- a/arch/metag/include/uapi/asm/Kbuild
+++ b/arch/metag/include/uapi/asm/Kbuild
--- a/arch/metag/include/uapi/asm/resource.h
+++ b/arch/metag/include/uapi/asm/resource.h
--- a/arch/mips/dec/ecc-berr.c
+++ b/arch/mips/dec/ecc-berr.c
--- a/arch/mips/dec/kn02xa-berr.c
+++ b/arch/mips/dec/kn02xa-berr.c
--- a/arch/mips/dec/prom/Makefile
+++ b/arch/mips/dec/prom/Makefile
--- a/arch/mips/dec/prom/call_o32.S
+++ b/arch/mips/dec/prom/call_o32.S
--- a/arch/mips/fw/lib/call_o32.S
+++ b/arch/mips/fw/lib/call_o32.S
--- a/arch/mips/fw/sni/sniprom.c
+++ b/arch/mips/fw/sni/sniprom.c
--- a/arch/mips/include/asm/dec/prom.h
+++ b/arch/mips/include/asm/dec/prom.h
--- a/arch/mips/include/asm/rm9k-ocd.h
+++ b/arch/mips/include/asm/rm9k-ocd.h
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
--- a/arch/mips/include/uapi/asm/inst.h
+++ b/arch/mips/include/uapi/asm/inst.h
--- a/arch/mips/include/uapi/asm/unistd.h
+++ b/arch/mips/include/uapi/asm/unistd.h
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/lantiq/dts/easy50712.dts
+++ b/arch/mips/lantiq/dts/easy50712.dts
--- a/arch/mips/lib/csum_partial.S
+++ b/arch/mips/lib/csum_partial.S
--- a/arch/mips/lib/delay.c
+++ b/arch/mips/lib/delay.c
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
--- a/arch/mips/mm/tlb-funcs.S
+++ b/arch/mips/mm/tlb-funcs.S
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
--- a/arch/mips/ralink/dts/mt7620a_eval.dts
+++ b/arch/mips/ralink/dts/mt7620a_eval.dts
--- a/arch/mips/ralink/dts/rt2880_eval.dts
+++ b/arch/mips/ralink/dts/rt2880_eval.dts
--- a/arch/mips/ralink/dts/rt3052_eval.dts
+++ b/arch/mips/ralink/dts/rt3052_eval.dts
--- a/arch/mips/ralink/dts/rt3883_eval.dts
+++ b/arch/mips/ralink/dts/rt3883_eval.dts
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
--- a/arch/parisc/include/uapi/asm/unistd.h
+++ b/arch/parisc/include/uapi/asm/unistd.h
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
--- a/drivers/Makefile
+++ b/drivers/Makefile
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
--- a/drivers/acpi/cm_sbs.c
+++ b/drivers/acpi/cm_sbs.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
--- a/drivers/ata/ahci_imx.c
+++ b/drivers/ata/ahci_imx.c
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
--- a/drivers/clk/bcm/clk-kona-setup.c
+++ b/drivers/clk/bcm/clk-kona-setup.c
--- a/drivers/clk/bcm/clk-kona.c
+++ b/drivers/clk/bcm/clk-kona.c
--- a/drivers/clk/bcm/clk-kona.h
+++ b/drivers/clk/bcm/clk-kona.h
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
--- a/drivers/clk/shmobile/clk-mstp.c
+++ b/drivers/clk/shmobile/clk-mstp.c
--- a/drivers/clk/socfpga/clk-pll.c
+++ b/drivers/clk/socfpga/clk-pll.c
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
--- a/Show more
+++ b/Show more