Merge branch 'master'

2026-09-14 18:22:56 +00:00 · 2005-10-30 20:37:44 -05:00 · 2005-10-30 20:37:44 -05:00 · 9e0cb06b17
commit 9e0cb06b17
parent 23da0c20ef 6e9d6b8ee4
190 changed files with 3515 additions and 3688 deletions
--- a/Documentation/cachetlb.txt
+++ b/Documentation/cachetlb.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
--- a/arch/alpha/mm/remap.c
+++ b/arch/alpha/mm/remap.c
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
--- a/arch/arm/oprofile/backtrace.c
+++ b/arch/arm/oprofile/backtrace.c
--- a/arch/arm26/mm/memc.c
+++ b/arch/arm26/mm/memc.c
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
--- a/arch/cris/mm/ioremap.c
+++ b/arch/cris/mm/ioremap.c
--- a/arch/frv/mm/dma-alloc.c
+++ b/arch/frv/mm/dma-alloc.c
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
--- a/arch/i386/mm/pgtable.c
+++ b/arch/i386/mm/pgtable.c
--- a/arch/i386/oprofile/backtrace.c
+++ b/arch/i386/oprofile/backtrace.c
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
--- a/arch/m32r/mm/ioremap.c
+++ b/arch/m32r/mm/ioremap.c
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
--- a/arch/m68k/sun3x/dvma.c
+++ b/arch/m68k/sun3x/dvma.c
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
--- a/arch/mips/mm/ioremap.c
+++ b/arch/mips/mm/ioremap.c
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
--- a/arch/ppc/mm/4xx_mmu.c
+++ b/arch/ppc/mm/4xx_mmu.c
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
--- a/arch/ppc64/kernel/vdso.c
+++ b/arch/ppc64/kernel/vdso.c
--- a/arch/ppc64/mm/imalloc.c
+++ b/arch/ppc64/mm/imalloc.c
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
--- a/arch/s390/mm/ioremap.c
+++ b/arch/s390/mm/ioremap.c
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
--- a/arch/sh/mm/hugetlbpage.c
+++ b/arch/sh/mm/hugetlbpage.c
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
--- a/arch/sh64/mm/cache.c
+++ b/arch/sh64/mm/cache.c
--- a/arch/sh64/mm/hugetlbpage.c
+++ b/arch/sh64/mm/hugetlbpage.c
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh64/mm/ioremap.c
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
--- a/arch/sparc64/mm/tlb.c
+++ b/arch/sparc64/mm/tlb.c
--- a/arch/um/include/tlb.h
+++ b/arch/um/include/tlb.h
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
--- a/arch/um/kernel/tt/tlb.c
+++ b/arch/um/kernel/tt/tlb.c
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86_64/ia32/ia32_aout.c
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
--- a/crypto/api.c
+++ b/crypto/api.c
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.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/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.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/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
--- a/Show more
+++ b/Show more