summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-19 18:30:52 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-19 18:30:52 +0200
commitbe39a7ed43b45f63aff1ad3b61008f67692db202 (patch)
tree8bd83904787d8b5f43f03ca6f9ca0d611f5d70b6
parent35a3221105d2b006112db809b78bde058c4f49ba (diff)
drm-intel-nightly: 2015y-06m-19d-16h-30m-08s UTC integration manifestdrm-intel-testing-2015-06-19
-rw-r--r--integration-manifest18
1 files changed, 18 insertions, 0 deletions
diff --git a/integration-manifest b/integration-manifest
new file mode 100644
index 000000000000..50cedf8fdea9
--- /dev/null
+++ b/integration-manifest
@@ -0,0 +1,18 @@
+origin/drm-intel-fixes 245ec9d85696c3e539b23e210f248698b478379c
+ Revert "drm/i915: Don't skip request retirement if the active list is empty"
+drm-upstream/drm-fixes fcee3c73a2c51982057b93fe599b7c68e16d0636
+ Merge tag 'drm-intel-fixes-2015-06-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes
+origin/drm-intel-next-fixes 4ed9fb371ccdfe465bd3bbb69e4cad5243e6c4e2
+ drm/i915: Don't set enabled value of all CRTCs when restoring the mode
+origin/drm-intel-next-queued 7fd2d26921d1dd70732d8765d714ec3a023a3ca9
+ drm/i915: Reset request handling for gen8+
+drm-upstream/drm-next 0dc499aff57f5e787214d5085dd1c391e0f93710
+ Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next
+sound-upstream/for-next d39513f85163e202a44283856286fabb6902f2e0
+ ALSA: HDAC: move SND_HDA_PREALLOC_SIZE to core
+origin/topic/drm-misc ffc5fbdb77e125a5923e3c0ba3fe465b1ebb2c54
+ drm: prime: Document gem_prime_mmap
+origin/topic/drm-fixes 2e7f43c41c042d6fed4d67aceeaae32d8f102e98
+ drm/plane-helper: Adapt cursor hack to transitional helpers
+origin/topic/atomic-conversion c0165304e10f317672e20f2b40770d74c51e287f
+ drm/i915: Only enable cursor if it can be enabled.