Merge branch 'master'

Conflicts: drivers/scsi/libata-scsi.c include/linux/libata.h
2026-09-14 18:22:56 +00:00 · 2006-04-11 12:51:40 -04:00 · 2006-04-11 12:51:40 -04:00 · 10a5fd5e6b
commit 10a5fd5e6b
parent c2a6585296 a145410dcc
503 changed files with 9223 additions and 8852 deletions
--- a/6
+++ b/6
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/isdn/README.gigaset
+++ b/Documentation/isdn/README.gigaset
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptop-mode.txt
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
--- a/Documentation/mtrr.txt
+++ b/Documentation/mtrr.txt
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/56
+++ b/56
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ b/arch/alpha/kernel/alpha_ksyms.c
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
--- a/arch/arm/mach-s3c2410/common-smdk.c
+++ b/arch/arm/mach-s3c2410/common-smdk.c
--- a/arch/arm/mm/cache-v4wb.S
+++ b/arch/arm/mm/cache-v4wb.S
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
--- a/arch/arm26/kernel/armksyms.c
+++ b/arch/arm26/kernel/armksyms.c
--- a/arch/cris/kernel/crisksyms.c
+++ b/arch/cris/kernel/crisksyms.c
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
--- a/arch/frv/kernel/frv_ksyms.c
+++ b/arch/frv/kernel/frv_ksyms.c
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/i386/kernel/i386_ksyms.c
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/reboot_fixups.c
+++ b/arch/i386/kernel/reboot_fixups.c
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
--- a/arch/m32r/kernel/m32r_ksyms.c
+++ b/arch/m32r/kernel/m32r_ksyms.c
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
--- a/arch/m32r/lib/Makefile
+++ b/arch/m32r/lib/Makefile
--- a/arch/m32r/lib/getuser.S
+++ b/arch/m32r/lib/getuser.S
--- a/arch/m32r/lib/putuser.S
+++ b/arch/m32r/lib/putuser.S
--- a/arch/m68k/kernel/m68k_ksyms.c
+++ b/arch/m68k/kernel/m68k_ksyms.c
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/ppc/boot/lib/Makefile
+++ b/arch/ppc/boot/lib/Makefile
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
--- a/arch/sh64/kernel/sh_ksyms.c
+++ b/arch/sh64/kernel/sh_ksyms.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/math-emu/Makefile
+++ b/arch/sparc/math-emu/Makefile
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
--- a/Show more
+++ b/Show more