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

2026-09-16 18:15:52 +00:00 · 2005-06-13 13:25:38 -05:00 · 2005-06-13 13:25:38 -05:00 · 5893a65711
commit 5893a65711
parent d6e04ae64c c0105338eb
136 changed files with 1479 additions and 757 deletions
--- a/6
+++ b/6
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/compressed/head-xscale.S
+++ b/arch/arm/boot/compressed/head-xscale.S
--- a/arch/arm/configs/badge4_defconfig
+++ b/arch/arm/configs/badge4_defconfig
--- a/arch/arm/configs/h3600_defconfig
+++ b/arch/arm/configs/h3600_defconfig
--- a/arch/arm/configs/hackkit_defconfig
+++ b/arch/arm/configs/hackkit_defconfig
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
--- a/arch/arm/mm/copypage-xscale.S
+++ b/arch/arm/mm/copypage-xscale.S
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
--- a/arch/arm/mm/minicache.c
+++ b/arch/arm/mm/minicache.c
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
--- a/arch/ppc/kernel/cputable.c
+++ b/arch/ppc/kernel/cputable.c
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
--- a/arch/ppc/platforms/pmac_cpufreq.c
+++ b/arch/ppc/platforms/pmac_cpufreq.c
--- a/arch/ppc64/boot/prom.c
+++ b/arch/ppc64/boot/prom.c
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
--- a/arch/ppc64/kernel/syscalls.c
+++ b/arch/ppc64/kernel/syscalls.c
--- a/arch/um/Kconfig_char
+++ b/arch/um/Kconfig_char
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
--- a/arch/um/drivers/slip.h
+++ b/arch/um/drivers/slip.h
--- a/arch/um/drivers/slip_proto.h
+++ b/arch/um/drivers/slip_proto.h
--- a/arch/um/drivers/slirp.h
+++ b/arch/um/drivers/slirp.h
--- a/arch/um/drivers/stderr_console.c
+++ b/arch/um/drivers/stderr_console.c
--- a/arch/um/include/mconsole.h
+++ b/arch/um/include/mconsole.h
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
--- a/arch/um/kernel/skas/process_kern.c
+++ b/arch/um/kernel/skas/process_kern.c
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture.c
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
--- a/drivers/usb/media/pwc/pwc-if.c
+++ b/drivers/usb/media/pwc/pwc-if.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
--- a/Show more
+++ b/Show more