Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge request by Jani to get at commit 249c4f538b Author: Deepak M <m.deepak@intel.com> Date: Wed Mar 30 17:03:39 2016 +0300 drm: Add new DCS commands in the enum list Some simple conflicts in intel_dp.c. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2026-11-13 07:31:07 +00:00 · 2016-05-17 12:15:49 +02:00 · 2016-05-17 12:15:49 +02:00 · 9a652cc01e
commit 9a652cc01e
parent e8fcdf1e65 99ee872950
1210 changed files with 95168 additions and 14944 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
--- a/include/drm/bridge/analogix_dp.h
+++ b/include/drm/bridge/analogix_dp.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_agpsupport.h
+++ b/include/drm/drm_agpsupport.h
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
--- a/include/drm/drm_cache.h
+++ b/include/drm/drm_cache.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_cma_helper.h
+++ b/include/drm/drm_fb_cma_helper.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
--- a/include/drm/drm_legacy.h
+++ b/include/drm/drm_legacy.h
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
--- a/include/drm/drm_vma_manager.h
+++ b/include/drm/drm_vma_manager.h
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/dt-bindings/clock/mt8173-clk.h
+++ b/include/dt-bindings/clock/mt8173-clk.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
--- a/include/linux/console.h
+++ b/include/linux/console.h
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
--- a/include/linux/devpts_fs.h
+++ b/include/linux/devpts_fs.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fscrypto.h
+++ b/include/linux/fscrypto.h
--- a/include/linux/hash.h
+++ b/include/linux/hash.h
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
--- a/include/linux/mlx5/port.h
+++ b/include/linux/mlx5/port.h
--- a/include/linux/mlx5/vport.h
+++ b/include/linux/mlx5/vport.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/net.h
+++ b/include/linux/net.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/of.h
+++ b/include/linux/of.h
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pmem.h
+++ b/include/linux/pmem.h
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
--- a/include/linux/reservation.h
+++ b/include/linux/reservation.h
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
--- a/include/rdma/ib.h
+++ b/include/rdma/ib.h
--- a/include/sound/hda_i915.h
+++ b/include/sound/hda_i915.h
--- a/include/sound/hda_regmap.h
+++ b/include/sound/hda_regmap.h
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
--- a/include/uapi/drm/qxl_drm.h
+++ b/include/uapi/drm/qxl_drm.h
--- a/include/uapi/drm/sis_drm.h
+++ b/include/uapi/drm/sis_drm.h
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
--- a/include/uapi/linux/if_macsec.h
+++ b/include/uapi/linux/if_macsec.h
--- a/include/uapi/linux/rio_mport_cdev.h
+++ b/include/uapi/linux/rio_mport_cdev.h
--- a/include/uapi/linux/swab.h
+++ b/include/uapi/linux/swab.h
--- a/include/uapi/linux/v4l2-dv-timings.h
+++ b/include/uapi/linux/v4l2-dv-timings.h
--- a/include/video/exynos5433_decon.h
+++ b/include/video/exynos5433_decon.h
--- a/include/video/mipi_display.h
+++ b/include/video/mipi_display.h
--- a/include/xen/page.h
+++ b/include/xen/page.h