Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2026-09-18 18:15:59 +00:00 · 2005-06-23 19:03:20 -07:00 · 2005-06-23 19:03:20 -07:00 · fa5cfae377
commit fa5cfae377
parent 0c0ff09329 16822e6205
443 changed files with 11314 additions and 4307 deletions
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/tcp.txt
+++ b/Documentation/networking/tcp.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/tty.txt
+++ b/Documentation/tty.txt
--- a/19
+++ b/19
--- a/2
+++ b/2
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/defconfig
+++ b/arch/alpha/defconfig
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/install.sh
+++ b/arch/arm/boot/install.sh
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
--- a/arch/arm/nwfpe/softfloat-macros
+++ b/arch/arm/nwfpe/softfloat-macros
--- a/arch/arm/nwfpe/softfloat.c
+++ b/arch/arm/nwfpe/softfloat.c
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
--- a/arch/arm26/boot/install.sh
+++ b/arch/arm26/boot/install.sh
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
--- a/arch/h8300/platform/h8300h/ptrace_h8300h.c
+++ b/arch/h8300/platform/h8300h/ptrace_h8300h.c
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
--- a/arch/i386/boot/install.sh
+++ b/arch/i386/boot/install.sh
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/i386/kernel/i386_ksyms.c
--- a/arch/i386/kernel/i387.c
+++ b/arch/i386/kernel/i387.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/nmi.c
+++ b/arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/pci-dma.c
+++ b/arch/i386/kernel/pci-dma.c
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
--- a/arch/i386/kernel/timers/common.c
+++ b/arch/i386/kernel/timers/common.c
--- a/arch/i386/kernel/timers/timer.c
+++ b/arch/i386/kernel/timers/timer.c
--- a/arch/i386/kernel/timers/timer_hpet.c
+++ b/arch/i386/kernel/timers/timer_hpet.c
--- a/arch/i386/kernel/timers/timer_pm.c
+++ b/arch/i386/kernel/timers/timer_pm.c
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/i386/lib/dec_and_lock.c
+++ b/arch/i386/lib/dec_and_lock.c
--- a/arch/i386/lib/delay.c
+++ b/arch/i386/lib/delay.c
--- a/arch/i386/lib/mmx.c
+++ b/arch/i386/lib/mmx.c
--- a/arch/i386/lib/usercopy.c
+++ b/arch/i386/lib/usercopy.c
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
--- a/arch/i386/mm/Makefile
+++ b/arch/i386/mm/Makefile
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
--- a/arch/i386/mm/highmem.c
+++ b/arch/i386/mm/highmem.c
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
--- a/arch/i386/mm/pgtable.c
+++ b/arch/i386/mm/pgtable.c
--- a/arch/i386/oprofile/backtrace.c
+++ b/arch/i386/oprofile/backtrace.c
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
--- a/arch/i386/power/cpu.c
+++ b/arch/i386/power/cpu.c
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig.debug
+++ b/arch/ia64/Kconfig.debug
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
--- a/arch/ppc/boot/simple/misc.c
+++ b/arch/ppc/boot/simple/misc.c
--- a/arch/ppc/boot/simple/mpc10x_memory.c
+++ b/arch/ppc/boot/simple/mpc10x_memory.c
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
--- a/arch/ppc64/boot/install.sh
+++ b/arch/ppc64/boot/install.sh
--- a/arch/ppc64/configs/pSeries_defconfig
+++ b/arch/ppc64/configs/pSeries_defconfig
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/defconfig
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
--- a/arch/ppc64/kernel/bpa_iic.c
+++ b/arch/ppc64/kernel/bpa_iic.c
--- a/arch/ppc64/kernel/bpa_iic.h
+++ b/arch/ppc64/kernel/bpa_iic.h
--- a/arch/ppc64/kernel/bpa_iommu.c
+++ b/arch/ppc64/kernel/bpa_iommu.c
--- a/arch/ppc64/kernel/bpa_iommu.h
+++ b/arch/ppc64/kernel/bpa_iommu.h
--- a/Show more
+++ b/Show more