Merge branch 'linus' into x86/urgent

Merge reason: Queueing up dependent early-printk fix. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-09-26 18:16:26 +00:00 · 2009-09-24 12:59:11 +02:00 · 2009-09-24 12:59:11 +02:00 · d2ff6de537
commit d2ff6de537
parent e23a8b6a8f a724eada8c
1475 changed files with 79469 additions and 29646 deletions
--- a/Documentation/ABI/stable/sysfs-class-backlight
+++ b/Documentation/ABI/stable/sysfs-class-backlight
--- a/Documentation/ABI/testing/sysfs-class-lcd
+++ b/Documentation/ABI/testing/sysfs-class-lcd
--- a/Documentation/ABI/testing/sysfs-class-led
+++ b/Documentation/ABI/testing/sysfs-class-led
--- a/Documentation/ABI/testing/sysfs-gpio
+++ b/Documentation/ABI/testing/sysfs-gpio
--- a/Documentation/ABI/testing/sysfs-platform-asus-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-asus-laptop
--- a/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
--- a/Documentation/DocBook/scsi.tmpl
+++ b/Documentation/DocBook/scsi.tmpl
--- a/Documentation/Intel-IOMMU.txt
+++ b/Documentation/Intel-IOMMU.txt
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
--- a/Documentation/auxdisplay/cfag12864b-example.c
+++ b/Documentation/auxdisplay/cfag12864b-example.c
--- a/Documentation/fb/ep93xx-fb.txt
+++ b/Documentation/fb/ep93xx-fb.txt
--- a/Documentation/fb/matroxfb.txt
+++ b/Documentation/fb/matroxfb.txt
--- a/Documentation/filesystems/ncpfs.txt
+++ b/Documentation/filesystems/ncpfs.txt
--- a/Documentation/filesystems/nfs41-server.txt
+++ b/Documentation/filesystems/nfs41-server.txt
--- a/Documentation/filesystems/nfsroot.txt
+++ b/Documentation/filesystems/nfsroot.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/gcov.txt
+++ b/Documentation/gcov.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/hwmon/acpi_power_meter
+++ b/Documentation/hwmon/acpi_power_meter
--- a/Documentation/hwmon/hpfall.c
+++ b/Documentation/hwmon/hpfall.c
--- a/Documentation/hwmon/pc87427
+++ b/Documentation/hwmon/pc87427
--- a/Documentation/i2c/busses/i2c-piix4
+++ b/Documentation/i2c/busses/i2c-piix4
--- a/Documentation/i2c/chips/pca9539
+++ b/Documentation/i2c/chips/pca9539
--- a/Documentation/i2c/chips/pcf8574
+++ b/Documentation/i2c/chips/pcf8574
--- a/Documentation/i2c/chips/pcf8575
+++ b/Documentation/i2c/chips/pcf8575
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kmemcheck.txt
+++ b/Documentation/kmemcheck.txt
--- a/Documentation/laptops/asus-laptop.txt
+++ b/Documentation/laptops/asus-laptop.txt
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/Documentation/leds-class.txt
+++ b/Documentation/leds-class.txt
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
--- a/Documentation/memory.txt
+++ b/Documentation/memory.txt
--- a/Documentation/networking/regulatory.txt
+++ b/Documentation/networking/regulatory.txt
--- a/Documentation/numastat.txt
+++ b/Documentation/numastat.txt
--- a/Documentation/pcmcia/crc32hash.c
+++ b/Documentation/pcmcia/crc32hash.c
--- a/Documentation/power/power_supply_class.txt
+++ b/Documentation/power/power_supply_class.txt
--- a/Documentation/power/regulator/design.txt
+++ b/Documentation/power/regulator/design.txt
--- a/Documentation/power/regulator/machine.txt
+++ b/Documentation/power/regulator/machine.txt
--- a/Documentation/power/regulator/overview.txt
+++ b/Documentation/power/regulator/overview.txt
--- a/Documentation/power/regulator/regulator.txt
+++ b/Documentation/power/regulator/regulator.txt
--- a/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
--- a/Documentation/powerpc/dts-bindings/marvell.txt
+++ b/Documentation/powerpc/dts-bindings/marvell.txt
--- a/Documentation/powerpc/dts-bindings/mtd-physmap.txt
+++ b/Documentation/powerpc/dts-bindings/mtd-physmap.txt
--- a/Documentation/rtc.txt
+++ b/Documentation/rtc.txt
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
--- a/Documentation/scsi/scsi_fc_transport.txt
+++ b/Documentation/scsi/scsi_fc_transport.txt
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
--- a/Documentation/spi/spidev_test.c
+++ b/Documentation/spi/spidev_test.c
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/trace/events-kmem.txt
+++ b/Documentation/trace/events-kmem.txt
--- a/Documentation/trace/events.txt
+++ b/Documentation/trace/events.txt
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
--- a/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl
+++ b/Documentation/trace/postprocess/trace-pagealloc-postprocess.pl
--- a/Documentation/trace/tracepoint-analysis.txt
+++ b/Documentation/trace/tracepoint-analysis.txt
--- a/Documentation/usb/authorization.txt
+++ b/Documentation/usb/authorization.txt
--- a/Documentation/usb/usbmon.txt
+++ b/Documentation/usb/usbmon.txt
--- a/Documentation/video4linux/v4lgrab.c
+++ b/Documentation/video4linux/v4lgrab.c
--- a/Documentation/vm/00-INDEX
+++ b/Documentation/vm/00-INDEX
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
--- a/Documentation/vm/ksm.txt
+++ b/Documentation/vm/ksm.txt
--- a/Documentation/vm/map_hugetlb.c
+++ b/Documentation/vm/map_hugetlb.c
--- a/Documentation/vm/page-types.c
+++ b/Documentation/vm/page-types.c
--- a/Documentation/vm/slabinfo.c
+++ b/Documentation/vm/slabinfo.c
--- a/Documentation/watchdog/src/watchdog-test.c
+++ b/Documentation/watchdog/src/watchdog-test.c
--- a/Documentation/x86/earlyprintk.txt
+++ b/Documentation/x86/earlyprintk.txt
--- a/194
+++ b/194
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/boot/tools/objstrip.c
+++ b/arch/alpha/boot/tools/objstrip.c
--- a/arch/alpha/include/asm/hardirq.h
+++ b/arch/alpha/include/asm/hardirq.h
--- a/arch/alpha/include/asm/mman.h
+++ b/arch/alpha/include/asm/mman.h
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/configs/n770_defconfig
+++ b/arch/arm/configs/n770_defconfig
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
--- a/arch/arm/configs/omap_3430sdp_defconfig
+++ b/arch/arm/configs/omap_3430sdp_defconfig
--- a/arch/arm/configs/omap_ldp_defconfig
+++ b/arch/arm/configs/omap_ldp_defconfig
--- a/arch/arm/include/asm/mman.h
+++ b/arch/arm/include/asm/mman.h
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
--- a/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c
+++ b/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
--- a/Show more
+++ b/Show more