Merge branch 'from-linus'

2026-09-14 18:22:56 +00:00 · 2006-02-27 20:12:23 -05:00 · 2006-02-27 20:12:23 -05:00 · 9f5a405b68
commit 9f5a405b68
parent b7cffb028a 051d3cbd96
344 changed files with 3687 additions and 4302 deletions
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
--- a/Documentation/filesystems/v9fs.txt
+++ b/Documentation/filesystems/v9fs.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/2
+++ b/2
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
--- a/arch/arm/mach-ixp4xx/nslu2-power.c
+++ b/arch/arm/mach-ixp4xx/nslu2-power.c
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/h8300/Kconfig.debug
+++ b/arch/h8300/Kconfig.debug
--- a/arch/h8300/defconfig
+++ b/arch/h8300/defconfig
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/transmeta.c
+++ b/arch/i386/kernel/cpu/transmeta.c
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/i386/kernel/i386_ksyms.c
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/mach-default/topology.c
+++ b/arch/i386/mach-default/topology.c
--- a/arch/i386/mach-default/Makefile
+++ b/arch/i386/mach-default/Makefile
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
--- a/arch/ia64/sn/kernel/sn2/prominfo_proc.c
+++ b/arch/ia64/sn/kernel/sn2/prominfo_proc.c
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
--- a/arch/ia64/sn/kernel/sn2/timer_interrupt.c
+++ b/arch/ia64/sn/kernel/sn2/timer_interrupt.c
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
--- a/arch/m32r/lib/usercopy.c
+++ b/arch/m32r/lib/usercopy.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
--- a/arch/mips/kernel/binfmt_elfn32.c
+++ b/arch/mips/kernel/binfmt_elfn32.c
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.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/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
--- a/arch/mips/kernel/smp_mt.c
+++ b/arch/mips/kernel/smp_mt.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/mm/cex-sb1.S
+++ b/arch/mips/mm/cex-sb1.S
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
--- a/Show more
+++ b/Show more