Merge branch 'linus' into stackprotector

Conflicts: arch/x86/kernel/Makefile include/asm-x86/pda.h
2026-09-26 18:16:26 +00:00 · 2008-10-15 13:46:29 +02:00 · 2008-10-15 13:46:29 +02:00 · b2aaf8f74c
commit b2aaf8f74c
parent 4f962d4d65 278429cff8
17815 changed files with 1505334 additions and 1129068 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/.mailmap
+++ b/.mailmap
--- a/16
+++ b/16
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
--- a/Documentation/ABI/testing/sysfs-bus-css
+++ b/Documentation/ABI/testing/sysfs-bus-css
--- a/Documentation/ABI/testing/sysfs-class-regulator
+++ b/Documentation/ABI/testing/sysfs-class-regulator
--- a/Documentation/ABI/testing/sysfs-dev
+++ b/Documentation/ABI/testing/sysfs-dev
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
--- a/Documentation/ABI/testing/sysfs-firmware-memmap
+++ b/Documentation/ABI/testing/sysfs-firmware-memmap
--- a/Documentation/ABI/testing/sysfs-firmware-sgi_uv
+++ b/Documentation/ABI/testing/sysfs-firmware-sgi_uv
--- a/Documentation/ABI/testing/sysfs-gpio
+++ b/Documentation/ABI/testing/sysfs-gpio
--- a/Documentation/ABI/testing/sysfs-kernel-mm
+++ b/Documentation/ABI/testing/sysfs-kernel-mm
--- a/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
+++ b/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
--- a/Documentation/DocBook/mac80211.tmpl
+++ b/Documentation/DocBook/mac80211.tmpl
--- a/Documentation/DocBook/procfs-guide.tmpl
+++ b/Documentation/DocBook/procfs-guide.tmpl
--- a/Documentation/DocBook/procfs_example.c
+++ b/Documentation/DocBook/procfs_example.c
--- a/Documentation/DocBook/s390-drivers.tmpl
+++ b/Documentation/DocBook/s390-drivers.tmpl
--- a/Documentation/DocBook/sh.tmpl
+++ b/Documentation/DocBook/sh.tmpl
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/DocBook/videobook.tmpl
+++ b/Documentation/DocBook/videobook.tmpl
--- a/Documentation/DocBook/z8530book.tmpl
+++ b/Documentation/DocBook/z8530book.tmpl
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/IRQ-affinity.txt
+++ b/Documentation/IRQ-affinity.txt
--- a/Documentation/Intel-IOMMU.txt
+++ b/Documentation/Intel-IOMMU.txt
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
--- a/Documentation/RCU/RTFP.txt
+++ b/Documentation/RCU/RTFP.txt
--- a/Documentation/RCU/checklist.txt
+++ b/Documentation/RCU/checklist.txt
--- a/Documentation/RCU/rcuref.txt
+++ b/Documentation/RCU/rcuref.txt
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
--- a/Documentation/SELinux.txt
+++ b/Documentation/SELinux.txt
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/accounting/Makefile
+++ b/Documentation/accounting/Makefile
--- a/Documentation/accounting/delay-accounting.txt
+++ b/Documentation/accounting/delay-accounting.txt
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
--- a/Documentation/accounting/taskstats-struct.txt
+++ b/Documentation/accounting/taskstats-struct.txt
--- a/Documentation/arm/IXP4xx
+++ b/Documentation/arm/IXP4xx
--- a/Documentation/arm/Interrupts
+++ b/Documentation/arm/Interrupts
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
--- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt
+++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
--- a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
+++ b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
--- a/Documentation/auxdisplay/Makefile
+++ b/Documentation/auxdisplay/Makefile
--- a/Documentation/auxdisplay/cfag12864b
+++ b/Documentation/auxdisplay/cfag12864b
--- a/Documentation/auxdisplay/cfag12864b-example.c
+++ b/Documentation/auxdisplay/cfag12864b-example.c
--- a/Documentation/auxdisplay/ks0108
+++ b/Documentation/auxdisplay/ks0108
--- a/Documentation/blackfin/kgdb.txt
+++ b/Documentation/blackfin/kgdb.txt
--- a/Documentation/block/data-integrity.txt
+++ b/Documentation/block/data-integrity.txt
--- a/Documentation/block/deadline-iosched.txt
+++ b/Documentation/block/deadline-iosched.txt
--- a/Documentation/bt8xxgpio.txt
+++ b/Documentation/bt8xxgpio.txt
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/cdrom/ide-cd
+++ b/Documentation/cdrom/ide-cd
--- a/Documentation/cgroups.txt
+++ b/Documentation/cgroups.txt
--- a/Documentation/cli-sti-removal.txt
+++ b/Documentation/cli-sti-removal.txt
--- a/Documentation/connector/Makefile
+++ b/Documentation/connector/Makefile
--- a/Documentation/controllers/devices.txt
+++ b/Documentation/controllers/devices.txt
--- a/Documentation/controllers/memory.txt
+++ b/Documentation/controllers/memory.txt
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
--- a/Documentation/cpu-freq/index.txt
+++ b/Documentation/cpu-freq/index.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
--- a/Documentation/fb/sh7760fb.txt
+++ b/Documentation/fb/sh7760fb.txt
--- a/Documentation/fb/tridentfb.txt
+++ b/Documentation/fb/tridentfb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/bfs.txt
+++ b/Documentation/filesystems/bfs.txt
--- a/Documentation/filesystems/configfs/Makefile
+++ b/Documentation/filesystems/configfs/Makefile
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
--- a/Documentation/filesystems/configfs/configfs_example_explicit.c
+++ b/Documentation/filesystems/configfs/configfs_example_explicit.c
--- a/Documentation/filesystems/configfs/configfs_example_macros.c
+++ b/Documentation/filesystems/configfs/configfs_example_macros.c
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
--- a/Documentation/filesystems/fiemap.txt
+++ b/Documentation/filesystems/fiemap.txt
--- a/Documentation/filesystems/gfs2-glocks.txt
+++ b/Documentation/filesystems/gfs2-glocks.txt
--- a/Documentation/filesystems/nfs-rdma.txt
+++ b/Documentation/filesystems/nfs-rdma.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
--- a/Documentation/filesystems/omfs.txt
+++ b/Documentation/filesystems/omfs.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/quota.txt
+++ b/Documentation/filesystems/quota.txt
--- a/Documentation/filesystems/relay.txt
+++ b/Documentation/filesystems/relay.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
--- a/Show more
+++ b/Show more