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-20 13:12:51 -05:00 · 2005-06-20 13:12:51 -05:00 · 58aab753de
commit 58aab753de
parent 5893a65711 8b22c249e7
390 changed files with 27833 additions and 25535 deletions
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/scsidrivers.tmpl
+++ b/Documentation/DocBook/scsidrivers.tmpl
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/networking/generic-hdlc.txt
+++ b/Documentation/networking/generic-hdlc.txt
--- a/Documentation/networking/multicast.txt
+++ b/Documentation/networking/multicast.txt
--- a/Documentation/networking/net-modules.txt
+++ b/Documentation/networking/net-modules.txt
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
--- a/Documentation/scsi/scsi-changer.txt
+++ b/Documentation/scsi/scsi-changer.txt
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
--- a/53
+++ b/53
--- a/2
+++ b/2
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.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/mach-integrator/Makefile
+++ b/arch/arm/mach-integrator/Makefile
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
--- a/arch/arm/mach-integrator/headsmp.S
+++ b/arch/arm/mach-integrator/headsmp.S
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
--- a/arch/arm/mach-integrator/leds.c
+++ b/arch/arm/mach-integrator/leds.c
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
--- 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-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
--- a/arch/ppc/kernel/ptrace.c
+++ b/arch/ppc/kernel/ptrace.c
--- a/arch/ppc64/configs/g5_defconfig
+++ b/arch/ppc64/configs/g5_defconfig
--- a/arch/ppc64/configs/iSeries_defconfig
+++ b/arch/ppc64/configs/iSeries_defconfig
--- a/arch/ppc64/configs/maple_defconfig
+++ b/arch/ppc64/configs/maple_defconfig
--- a/arch/ppc64/configs/pSeries_defconfig
+++ b/arch/ppc64/configs/pSeries_defconfig
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/defconfig
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
--- a/arch/um/drivers/slip.h
+++ b/arch/um/drivers/slip.h
--- a/arch/um/drivers/slip_common.c
+++ b/arch/um/drivers/slip_common.c
--- a/arch/um/drivers/slip_common.h
+++ b/arch/um/drivers/slip_common.h
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
--- a/arch/um/drivers/slirp.h
+++ b/arch/um/drivers/slirp.h
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
--- a/arch/um/include/sysdep-i386/ptrace.h
+++ b/arch/um/include/sysdep-i386/ptrace.h
--- a/arch/um/kernel/main.c
+++ b/arch/um/kernel/main.c
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
--- a/drivers/fc4/fc_syms.c
+++ b/drivers/fc4/fc_syms.c
--- a/drivers/fc4/fcp_impl.h
+++ b/drivers/fc4/fcp_impl.h
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
--- a/drivers/message/fusion/lsi/mpi.h
+++ b/drivers/message/fusion/lsi/mpi.h
--- a/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/drivers/message/fusion/lsi/mpi_cnfg.h
--- a/drivers/message/fusion/lsi/mpi_fc.h
+++ b/drivers/message/fusion/lsi/mpi_fc.h
--- a/drivers/message/fusion/lsi/mpi_history.txt
+++ b/drivers/message/fusion/lsi/mpi_history.txt
--- a/drivers/message/fusion/lsi/mpi_inb.h
+++ b/drivers/message/fusion/lsi/mpi_inb.h
--- a/drivers/message/fusion/lsi/mpi_init.h
+++ b/drivers/message/fusion/lsi/mpi_init.h
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
--- a/drivers/message/fusion/lsi/mpi_lan.h
+++ b/drivers/message/fusion/lsi/mpi_lan.h
--- a/drivers/message/fusion/lsi/mpi_raid.h
+++ b/drivers/message/fusion/lsi/mpi_raid.h
--- a/drivers/message/fusion/lsi/mpi_sas.h
+++ b/drivers/message/fusion/lsi/mpi_sas.h
--- a/drivers/message/fusion/lsi/mpi_targ.h
+++ b/drivers/message/fusion/lsi/mpi_targ.h
--- a/drivers/message/fusion/lsi/mpi_tool.h
+++ b/drivers/message/fusion/lsi/mpi_tool.h
--- a/drivers/message/fusion/lsi/mpi_type.h
+++ b/drivers/message/fusion/lsi/mpi_type.h
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
--- a/drivers/message/fusion/mptctl.h
+++ b/drivers/message/fusion/mptctl.h
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
--- a/Show more
+++ b/Show more