Merge branch 'master' into upstream

2026-09-20 18:15:29 +00:00 · 2006-07-24 03:40:11 -04:00 · 2006-07-24 03:40:11 -04:00 · d11ea48aab
commit d11ea48aab
parent 22ad852b82 abb5a5cc6b
237 changed files with 1832 additions and 1617 deletions
--- a/4
+++ b/4
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
--- a/arch/sparc/kernel/prom.c
+++ b/arch/sparc/kernel/prom.c
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
--- a/arch/sparc/prom/tree.c
+++ b/arch/sparc/prom/tree.c
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
--- a/arch/sparc64/kernel/devices.c
+++ b/arch/sparc64/kernel/devices.c
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
--- a/arch/sparc64/prom/tree.c
+++ b/arch/sparc64/prom/tree.c
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.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/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/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
--- a/drivers/net/wan/hdlc_raw.c
+++ b/drivers/net/wan/hdlc_raw.c
--- a/drivers/net/wan/hdlc_raw_eth.c
+++ b/drivers/net/wan/hdlc_raw_eth.c
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
--- a/drivers/scsi/lpfc/lpfc_sli.h
+++ b/drivers/scsi/lpfc/lpfc_sli.h
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.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_priv.h
+++ b/drivers/scsi/scsi_priv.h
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
--- a/Show more
+++ b/Show more