Dave Airlie 41206a073c Merge v5.8-rc6 into drm-next ...

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>

2020-07-24 08:48:05 +10:00

..

heaps

dma-buf: heaps: Remove redundant heap identifier from system heap name

2019-12-17 21:37:40 +05:30

dma-buf.c

Merge v5.8-rc6 into drm-next

2020-07-24 08:48:05 +10:00

dma-fence-array.c

dma-fence: Propagate errors to dma-fence-array container

2019-08-12 08:25:52 +01:00

dma-fence-chain.c

Revert "dma-buf: Report signaled links inside dma-fence-chain"

2020-07-02 15:21:24 +02:00

dma-fence.c

dma-fence: Make symbol 'dma_fence_lockdep_map' static

2020-07-23 14:33:12 +10:00

dma-heap.c

dma-heap: Make the symbol 'dma_heap_ioctl_cmds' static

2019-12-18 00:41:29 +05:30

dma-resv.c

dma-fence: prime lockdep annotations

2020-07-21 09:42:19 +02:00

Kconfig

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

Makefile

dma-buf: Exercise dma-fence-chain under selftests

2020-04-09 19:58:55 +01:00

selftest.c

dma-buf: Introduce selftesting framework

2019-08-19 18:01:34 +01:00

selftest.h

dma-buf: Introduce selftesting framework

2019-08-19 18:01:34 +01:00

selftests.h

Merge drm/drm-next into drm-intel-next-queued

2020-06-25 18:05:03 +03:00

seqno-fence.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174

2019-05-30 11:26:41 -07:00

st-dma-fence-chain.c

dma-buf: fix dma-fence-chain out of order test

2020-07-02 15:21:40 +02:00

st-dma-fence.c

dmabuf: Mark up onstack timer for selftests

2019-08-20 13:49:15 +01:00

sw_sync.c

compat_ioctl: move more drivers to compat_ptr_ioctl

2019-10-23 17:23:44 +02:00

sync_debug.c

Merge v5.2-rc5 into drm-next

2019-06-19 12:07:29 +02:00

sync_debug.h

dma-buf: Remove unused sync_dump()

2019-04-23 09:30:07 +01:00

sync_file.c

Merge tag 'drm-misc-fixes-2019-11-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

2019-12-09 17:13:19 +10:00

sync_trace.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

udmabuf.c

udmabuf: fix dma-buf cpu access

2019-12-18 09:11:38 +01:00