Merge branch 'linus' into x86/urgent

Merge reason: We want to queue up a dependent fix. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-10-16 22:39:48 +00:00 · 2010-10-25 19:38:43 +02:00 · 2010-10-25 19:38:43 +02:00 · 7d7a48b760
commit 7d7a48b760
parent e4072a9a9d 229aebb873
5216 changed files with 342321 additions and 212216 deletions
--- a/Documentation/ABI/testing/sysfs-ata
+++ b/Documentation/ABI/testing/sysfs-ata
--- a/Documentation/ABI/testing/sysfs-devices-power
+++ b/Documentation/ABI/testing/sysfs-devices-power
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
--- a/Documentation/ABI/testing/sysfs-module
+++ b/Documentation/ABI/testing/sysfs-module
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
--- a/Documentation/DocBook/genericirq.tmpl
+++ b/Documentation/DocBook/genericirq.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
--- a/Documentation/DocBook/mac80211.tmpl
+++ b/Documentation/DocBook/mac80211.tmpl
--- a/Documentation/RCU/checklist.txt
+++ b/Documentation/RCU/checklist.txt
--- a/Documentation/RCU/stallwarn.txt
+++ b/Documentation/RCU/stallwarn.txt
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
--- a/Documentation/arm/SA1100/FreeBird
+++ b/Documentation/arm/SA1100/FreeBird
--- a/Documentation/arm/msm/gpiomux.txt
+++ b/Documentation/arm/msm/gpiomux.txt
--- a/Documentation/block/00-INDEX
+++ b/Documentation/block/00-INDEX
--- a/Documentation/block/barrier.txt
+++ b/Documentation/block/barrier.txt
--- a/Documentation/block/writeback_cache_control.txt
+++ b/Documentation/block/writeback_cache_control.txt
--- a/Documentation/cgroups/blkio-controller.txt
+++ b/Documentation/cgroups/blkio-controller.txt
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/dynamic-debug-howto.txt
+++ b/Documentation/dynamic-debug-howto.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
--- a/Documentation/input/ntrig.txt
+++ b/Documentation/input/ntrig.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/kvm/api.txt
+++ b/Documentation/kvm/api.txt
--- a/Documentation/kvm/ppc-pv.txt
+++ b/Documentation/kvm/ppc-pv.txt
--- a/Documentation/kvm/timekeeping.txt
+++ b/Documentation/kvm/timekeeping.txt
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
--- a/Documentation/networking/dccp.txt
+++ b/Documentation/networking/dccp.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/phonet.txt
+++ b/Documentation/networking/phonet.txt
--- a/Documentation/networking/timestamping.txt
+++ b/Documentation/networking/timestamping.txt
--- a/Documentation/pcmcia/driver-changes.txt
+++ b/Documentation/pcmcia/driver-changes.txt
--- a/Documentation/power/00-INDEX
+++ b/Documentation/power/00-INDEX
--- a/Documentation/power/interface.txt
+++ b/Documentation/power/interface.txt
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/Documentation/power/s2ram.txt
+++ b/Documentation/power/s2ram.txt
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
--- a/Documentation/powerpc/dts-bindings/fsl/spi.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/spi.txt
--- a/Documentation/powerpc/dts-bindings/fsl/usb.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/usb.txt
--- a/Documentation/scsi/st.txt
+++ b/Documentation/scsi/st.txt
--- a/Documentation/usb/proc_usb_info.txt
+++ b/Documentation/usb/proc_usb_info.txt
--- a/Documentation/vm/numa_memory_policy.txt
+++ b/Documentation/vm/numa_memory_policy.txt
--- a/Documentation/workqueue.txt
+++ b/Documentation/workqueue.txt
--- a/Documentation/x86/x86_64/kernel-stacks
+++ b/Documentation/x86/x86_64/kernel-stacks
--- a/1
+++ b/1
--- a/146
+++ b/146
--- a/22
+++ b/22
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/include/asm/irqflags.h
+++ b/arch/alpha/include/asm/irqflags.h
--- a/arch/alpha/include/asm/perf_event.h
+++ b/arch/alpha/include/asm/perf_event.h
--- a/arch/alpha/include/asm/system.h
+++ b/arch/alpha/include/asm/system.h
--- a/arch/alpha/kernel/perf_event.c
+++ b/arch/alpha/kernel/perf_event.c
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/common/icst.c
+++ b/arch/arm/common/icst.c
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
--- a/arch/arm/common/uengine.c
+++ b/arch/arm/common/uengine.c
--- a/arch/arm/configs/at91sam9g20ek_defconfig
+++ b/arch/arm/configs/at91sam9g20ek_defconfig
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
--- a/arch/arm/configs/mx27_defconfig
+++ b/arch/arm/configs/mx27_defconfig
--- a/arch/arm/configs/mx31pdk_defconfig
+++ b/arch/arm/configs/mx31pdk_defconfig
--- a/arch/arm/configs/mx3_defconfig
+++ b/arch/arm/configs/mx3_defconfig
--- a/arch/arm/configs/mx51_defconfig
+++ b/arch/arm/configs/mx51_defconfig
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
--- a/arch/arm/configs/s5p64x0_defconfig
+++ b/arch/arm/configs/s5p64x0_defconfig
--- a/arch/arm/configs/u300_defconfig
+++ b/arch/arm/configs/u300_defconfig
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
--- a/arch/arm/include/asm/cachetype.h
+++ b/arch/arm/include/asm/cachetype.h
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
--- a/arch/arm/include/asm/hardware/coresight.h
+++ b/arch/arm/include/asm/hardware/coresight.h
--- a/arch/arm/include/asm/hardware/icst.h
+++ b/arch/arm/include/asm/hardware/icst.h
--- a/arch/arm/include/asm/hw_breakpoint.h
+++ b/arch/arm/include/asm/hw_breakpoint.h
--- a/arch/arm/include/asm/hw_irq.h
+++ b/arch/arm/include/asm/hw_irq.h
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
--- a/arch/arm/include/asm/ioctls.h
+++ b/arch/arm/include/asm/ioctls.h
--- a/arch/arm/include/asm/irqflags.h
+++ b/arch/arm/include/asm/irqflags.h
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
--- a/arch/arm/include/asm/mmu_context.h
+++ b/arch/arm/include/asm/mmu_context.h
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
--- a/arch/arm/include/asm/perf_event.h
+++ b/arch/arm/include/asm/perf_event.h
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
--- a/Show more
+++ b/Show more