diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 08:31:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 14:01:53 +0200 |
| commit | 0b076ecdf343b029c4c2c3a94ffd0199d97aa46c (patch) | |
| tree | 38407c97a7f90cb46a9e8c487676a65ce2ed9209 /drivers/gpu/drm/nouveau/nouveau_fence.c | |
| parent | drm/i915/gen8: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround (diff) | |
| parent | drm/dp/mst: take lock around looking up the branch device on hpd irq (diff) | |
| download | linux-0b076ecdf343b029c4c2c3a94ffd0199d97aa46c.tar.xz linux-0b076ecdf343b029c4c2c3a94ffd0199d97aa46c.zip | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next because the conflict between Ander's atomic fixes
for 4.2 and Maartens future work are getting to unwielding to handle.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.h
Just always take ours, same as git merge -X ours, but done by hand
because I didn't trust git: It's confusing that it doesn't show any
conflicts in the merge diff at all.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fence.c')
0 files changed, 0 insertions, 0 deletions