[Intel-gfx] linux-next: manual merge of the etnaviv tree with the drm-misc tree

Hi all, Today's linux-next merge of the etnaviv tree got a conflict in: drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm-misc tree and commit: 6eae41fea750 ("drm/etnaviv: drop use of drmP.h") 2e73

[Intel-gfx] linux-next: manual merge of the etnaviv tree with the drm-misc tree

Hi Lucas, Today's linux-next merge of the etnaviv tree got a conflict in: drivers/gpu/drm/etnaviv/etnaviv_drv.c between commit: 808bad32ea42 ("drm: replace "drm_dev_unref" function with "drm_dev_put"") from the drm-misc tree and commit: 99e294492ef9 ("drm/etnaviv: Replace drm_dev_unref