Merge branch 'upstream-fixes' into upstream

2026-09-20 18:15:29 +00:00 · 2006-07-29 01:39:26 -04:00 · 2006-07-29 01:39:26 -04:00 · 5b85f29ca4
commit 5b85f29ca4
parent 48cb37bd9e ab3b3fd381
82 changed files with 823 additions and 541 deletions
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
--- a/block/blktrace.c
+++ b/block/blktrace.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
--- a/drivers/infiniband/hw/ipath/ipath_keys.c
+++ b/drivers/infiniband/hw/ipath/ipath_keys.c
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
--- a/fs/xfs/quota/xfs_qm_bhv.c
+++ b/fs/xfs/quota/xfs_qm_bhv.c
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
--- a/include/asm-sparc/signal.h
+++ b/include/asm-sparc/signal.h
--- a/include/asm-sparc64/pgtable.h
+++ b/include/asm-sparc64/pgtable.h
--- a/include/asm-sparc64/sfp-machine.h
+++ b/include/asm-sparc64/sfp-machine.h
--- a/include/asm-x86_64/page.h
+++ b/include/asm-x86_64/page.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
--- a/net/dccp/feat.h
+++ b/net/dccp/feat.h
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
--- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
--- a/net/ipv4/netfilter/ip_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c