Merge branch 'upstream'

2026-09-16 18:15:52 +00:00 · 2006-03-03 12:16:03 -05:00 · 2006-03-03 12:16:03 -05:00 · 801c63c38a
commit 801c63c38a
parent 1ed82ae3df 348edc59a8
104 changed files with 1481 additions and 1022 deletions
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
--- a/arch/ia64/configs/gensparse_defconfig
+++ b/arch/ia64/configs/gensparse_defconfig
--- a/arch/ia64/configs/sim_defconfig
+++ b/arch/ia64/configs/sim_defconfig
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
--- a/arch/mips/kernel/smp_mt.c
+++ b/arch/mips/kernel/smp_mt.c
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
--- a/arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
--- a/drivers/scsi/aha152x.h
+++ b/drivers/scsi/aha152x.h
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
--- a/include/asm-ia64/sn/arch.h
+++ b/include/asm-ia64/sn/arch.h
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
--- a/include/asm-mips/smp.h
+++ b/include/asm-mips/smp.h
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
--- a/include/asm-powerpc/eeh.h
+++ b/include/asm-powerpc/eeh.h
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
--- a/include/linux/netfilter_bridge/ebt_log.h
+++ b/include/linux/netfilter_bridge/ebt_log.h
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/include/linux/netfilter_ipv6/ip6t_LOG.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
--- a/mm/nommu.c
+++ b/mm/nommu.c
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
--- a/mm/rmap.c
+++ b/mm/rmap.c
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
--- a/Show more
+++ b/Show more