Merge branch 'drm-intel-fixes' into drm-intel-next

2026-10-14 05:55:17 +00:00 · 2010-12-09 20:22:04 +00:00 · 2010-12-09 20:22:04 +00:00 · 8d5203ca62
commit 8d5203ca62
parent 8fd2685911 63abf3edaf
168 changed files with 1873 additions and 905 deletions
--- a/Documentation/ABI/testing/sysfs-platform-asus-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-asus-laptop
--- a/Documentation/ABI/testing/sysfs-platform-eeepc-wmi
+++ b/Documentation/ABI/testing/sysfs-platform-eeepc-wmi
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/2
+++ b/2
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
--- a/arch/arm/boot/bootp/init.S
+++ b/arch/arm/boot/bootp/init.S
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/kernel/relocate_kernel.S
+++ b/arch/arm/kernel/relocate_kernel.S
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
--- a/arch/arm/mach-realview/headsmp.S
+++ b/arch/arm/mach-realview/headsmp.S
--- a/arch/arm/mach-s3c2412/Kconfig
+++ b/arch/arm/mach-s3c2412/Kconfig
--- a/arch/arm/mach-s3c2416/Kconfig
+++ b/arch/arm/mach-s3c2416/Kconfig
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
--- a/arch/arm/mach-s3c2443/Kconfig
+++ b/arch/arm/mach-s3c2443/Kconfig
--- a/arch/arm/mach-tegra/include/mach/debug-macro.S
+++ b/arch/arm/mach-tegra/include/mach/debug-macro.S
--- a/arch/arm/mach-vexpress/headsmp.S
+++ b/arch/arm/mach-vexpress/headsmp.S
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
--- a/arch/arm/plat-s3c24xx/gpiolib.c
+++ b/arch/arm/plat-s3c24xx/gpiolib.c
--- a/arch/arm/plat-s3c24xx/include/plat/s3c244x.h
+++ b/arch/arm/plat-s3c24xx/include/plat/s3c244x.h
--- a/arch/arm/plat-samsung/gpio-config.c
+++ b/arch/arm/plat-samsung/gpio-config.c
--- a/arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
+++ b/arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
--- a/arch/mn10300/include/asm/syscall.h
+++ b/arch/mn10300/include/asm/syscall.h
--- a/arch/mn10300/kernel/gdb-io-serial.c
+++ b/arch/mn10300/kernel/gdb-io-serial.c
--- a/arch/mn10300/kernel/gdb-io-ttysm.c
+++ b/arch/mn10300/kernel/gdb-io-ttysm.c
--- a/arch/mn10300/kernel/gdb-stub.c
+++ b/arch/mn10300/kernel/gdb-stub.c
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
--- a/arch/sh/include/asm/cacheflush.h
+++ b/arch/sh/include/asm/cacheflush.h
--- a/arch/sh/include/cpu-sh4/cpu/sh7724.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
--- a/arch/sh/mm/cache-sh7705.c
+++ b/arch/sh/mm/cache-sh7705.c
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
--- a/arch/sh/mm/kmap.c
+++ b/arch/sh/mm/kmap.c
--- a/arch/x86/include/asm/pvclock.h
+++ b/arch/x86/include/asm/pvclock.h
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/platform-pci-unplug.c
+++ b/arch/x86/xen/platform-pci-unplug.c
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-egalax.c
+++ b/drivers/hid/hid-egalax.c
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
--- a/drivers/input/mouse/synaptics.h
+++ b/drivers/input/mouse/synaptics.h
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
--- a/Show more
+++ b/Show more