Merge branch 'upstream-fixes'

2026-09-24 18:16:04 +00:00 · 2006-02-17 16:20:30 -05:00 · 2006-02-17 16:20:30 -05:00 · b04a92e160
commit b04a92e160
parent 70c07e0262 f5e2a7b22e
436 changed files with 6439 additions and 4215 deletions
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.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/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/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/appletalk/cops.h
+++ b/drivers/net/appletalk/cops.h
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
--- a/drivers/net/tokenring/smctr.h
+++ b/drivers/net/tokenring/smctr.h
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
--- a/drivers/s390/scsi/zfcp_sysfs_adapter.c
+++ b/drivers/s390/scsi/zfcp_sysfs_adapter.c
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/qla2xxx/qla_rscn.c
+++ b/drivers/scsi/qla2xxx/qla_rscn.c
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.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_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
--- a/Show more
+++ b/Show more