Merge with /home/aegl/GIT/linus

2026-09-14 18:22:56 +00:00 · 2005-05-09 16:44:53 -07:00 · 2005-05-09 16:44:53 -07:00 · a84f577017
commit a84f577017
parent 66302f211a 88d7bd8cb9
44 changed files with 288 additions and 360 deletions
--- a/2
+++ b/2
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
--- a/arch/um/kernel/skas/include/mode_kern-skas.h
+++ b/arch/um/kernel/skas/include/mode_kern-skas.h
--- a/arch/um/kernel/skas/include/uaccess-skas.h
+++ b/arch/um/kernel/skas/include/uaccess-skas.h
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
--- a/arch/um/kernel/skas/process_kern.c
+++ b/arch/um/kernel/skas/process_kern.c
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
--- a/arch/um/kernel/syscall_kern.c
+++ b/arch/um/kernel/syscall_kern.c
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
--- a/arch/um/kernel/tt/include/mode_kern-tt.h
+++ b/arch/um/kernel/tt/include/mode_kern-tt.h
--- a/arch/um/kernel/tt/include/uaccess-tt.h
+++ b/arch/um/kernel/tt/include/uaccess-tt.h
--- a/arch/um/kernel/tt/mem.c
+++ b/arch/um/kernel/tt/mem.c
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
--- a/arch/um/kernel/tt/syscall_user.c
+++ b/arch/um/kernel/tt/syscall_user.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
--- a/arch/um/sys-ppc/ptrace.c
+++ b/arch/um/sys-ppc/ptrace.c
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
--- a/fs/partitions/msdos.c
+++ b/fs/partitions/msdos.c
--- a/include/asm-um/elf.h
+++ b/include/asm-um/elf.h
--- a/include/asm-um/setup.h
+++ b/include/asm-um/setup.h