Merge remote-tracking branch 'airlied/drm-next' into HEAD

Browse source

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>

...

This commit is contained in:

Daniel Vetter 2015-06-23 08:31:49 +02:00

parent c82435bbe5 9eb1e57f56

commit 0b076ecdf3

394 changed files with 432086 additions and 3153 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

631

include/uapi/drm/amdgpu_drm.h

View file

15

include/uapi/drm/drm_fourcc.h

View file

76

include/uapi/drm/msm_drm.h

View file

2

include/uapi/linux/virtio_gpu.h

View file