Hi all,
Today's linux-next merge of the drm-misc-fixes tree got a conflict in:
drivers/accel/ivpu/ivpu_gem.c
between commit:
835b14ce4ee3 ("accel/ivpu:
s/drm_gem_shmem_v[un]map/drm_gem_shmem_v[un]map_locked/")
from Linus' tree and commit:
98d3f772ca7d ("accel/ivpu: Use dma_resv_lock()
Hi all,
Today's linux-next merge of the drm-misc-fixes tree got a conflict in:
drivers/gpu/drm/tests/drm_buddy_test.c
between commit:
fca7526b7d89 ("drm/tests/drm_buddy: fix build failure on 32-bit targets")
from Linus' tree and commit:
335126937753 ("drm/tests/drm_buddy: fix 32b build"
Hi all,
Today's linux-next merge of the drm-misc-fixes tree got a conflict in:
drivers/dma-buf/dma-buf.c
between commit:
28743e25fa1c ("dma-buf: Remove obsoleted internal lock")
from Linus' tree and commit:
f728a5ea27c9 ("dma-buf: fix dma_buf_export init order v2")
from the drm-misc-fi
Hi all,
Today's linux-next merge of the drm-misc-fixes tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
b1044a9b8100 ("Revert drm/vc4 hdmi runtime PM changes")
from Linus' tree and commits:
36e9bcb8edfc ("drm/vc4: select PM")
a22dad7fa0cd ("drm/vc4: hdmi: Rework
