Merge branch 'master'

2026-09-18 18:15:59 +00:00 · 2005-12-01 01:59:38 -05:00 · 2005-12-01 01:59:38 -05:00 · 6fc8819896
commit 6fc8819896
parent 5f3fdeb624 5666c0947e
112 changed files with 1134 additions and 645 deletions
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
--- a/2
+++ b/2
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- 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/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
--- a/arch/ppc/kernel/process.c
+++ b/arch/ppc/kernel/process.c
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
--- a/drivers/atm/atmdev_init.c
+++ b/drivers/atm/atmdev_init.c
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
--- 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/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
--- a/fs/cifs/README
+++ b/fs/cifs/README
--- a/fs/cifs/TODO
+++ b/fs/cifs/TODO
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
--- a/mm/fremap.c
+++ b/mm/fremap.c
--- a/mm/memory.c
+++ b/mm/memory.c
--- a/mm/rmap.c
+++ b/mm/rmap.c
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
--- a/net/atm/common.c
+++ b/net/atm/common.c
--- a/net/atm/common.h
+++ b/net/atm/common.h
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
--- a/net/ipv4/ipvs/ip_vs_proto_tcp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
--- a/net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c
--- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
--- a/Show more
+++ b/Show more