Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/adreno/adreno_gpu.c
between commit:
7fa5047a436b ("drm: Use of_property_present() for testing DT property
presence")
from the drm-misc tree and commit:
9f251f934012 ("drm/msm/adreno: Use OPP
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
between commit:
29b77ad7b9ca ("drm/atomic: Pass the full state to CRTC atomic_check")
from the drm-misc tree and commit:
91693cbc13c2 ("drm/msm/dpu: Add newline to printks")
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/hdmi/hdmi.c
between commit:
f384d7d514d1 ("drm: Convert to using %pOFn instead of device_node.name")
from the drm-misc tree and commit:
bdc309778907 ("drm: msm: Use DRM_DEV_* instead of dev_*")
Hi Rob,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/msm_atomic.c
between commit:
a3ccfb9feb46 ("drm/msm: Rename async to nonblock.")
from the drm-misc tree and commit:
afadc4bb9380 ("drm/msm: remove fence_cbs")
from the drm-msm tree.
I fixed it
