Merge branch 'master' into gfs2

2026-09-18 18:15:59 +00:00 · 2006-09-04 10:31:36 -04:00 · 2006-09-04 10:31:36 -04:00 · 31e77ac55f
commit 31e77ac55f
parent 5029996547 c336923b66
171 changed files with 4764 additions and 2519 deletions
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/3
+++ b/3
--- a/2
+++ b/2
--- a/arch/arm/configs/csb337_defconfig
+++ b/arch/arm/configs/csb337_defconfig
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
--- a/arch/arm/vfp/vfp.h
+++ b/arch/arm/vfp/vfp.h
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
--- a/arch/i386/kernel/hpet.c
+++ b/arch/i386/kernel/hpet.c
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.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/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
--- a/arch/powerpc/boot/dts/mpc8349emds.dts
+++ b/arch/powerpc/boot/dts/mpc8349emds.dts
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_defconfig
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
--- a/arch/powerpc/kernel/smp-tbsync.c
+++ b/arch/powerpc/kernel/smp-tbsync.c
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
--- a/arch/powerpc/lib/memcpy_64.S
+++ b/arch/powerpc/lib/memcpy_64.S
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.c
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
--- a/arch/powerpc/sysdev/ipic.h
+++ b/arch/powerpc/sysdev/ipic.h
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
--- a/arch/ppc/kernel/smp-tbsync.c
+++ b/arch/ppc/kernel/smp-tbsync.c
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
--- a/arch/ppc/syslib/ipic.c
+++ b/arch/ppc/syslib/ipic.c
--- a/arch/ppc/syslib/ipic.h
+++ b/arch/ppc/syslib/ipic.h
--- a/arch/s390/lib/uaccess.S
+++ b/arch/s390/lib/uaccess.S
--- a/arch/s390/lib/uaccess64.S
+++ b/arch/s390/lib/uaccess64.S
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head.S
--- a/arch/x86_64/kernel/init_task.c
+++ b/arch/x86_64/kernel/init_task.c
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/char/watchdog/sbc8360.c
+++ b/drivers/char/watchdog/sbc8360.c
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
--- a/drivers/infiniband/hw/mthca/mthca_allocator.c
+++ b/drivers/infiniband/hw/mthca/mthca_allocator.c
--- a/drivers/macintosh/via-pmu-backlight.c
+++ b/drivers/macintosh/via-pmu-backlight.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
--- a/drivers/usb/net/pegasus.h
+++ b/drivers/usb/net/pegasus.h
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
--- a/Show more
+++ b/Show more