Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/msm_drv.h
between commit:
3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs")
from the drm tree and commit:
8f642378bfe5 ("drm/msm/gem: Move prototypes to msm_gem.h")
from the drm-msm tree.
I
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
include/drm/drm_crtc.h
between commit:
5c759eda9b04 ("drm: Introduce plane and CRTC scaling filter properties")
from the drm tree and commit:
cb21f3f882ad ("drm/msm/atomic: Drop per-CRTC locks in reverse order")
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/msm_iommu.c
between commit:
7690a33f22ab ("drm: msm: fix common struct sg_table related issues")
from the drm tree and commit:
e3c64c7221f6 ("drm/msm: Set the global virtual address range from
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/msm_gem.c
between commit:
7690a33f22ab ("drm: msm: fix common struct sg_table related issues")
from the drm tree and commit:
e1bf29e022fb ("drm/msm: drop cache sync hack")
from the drm-msm
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/adreno/a5xx_gpu.c
between commit:
c97ea6a61b5e ("drm: msm: adreno: Use PTR_ERR_OR_ZERO rather than
if(IS_ERR(...)) +PTR_ERR")
from the drm tree and commits:
dadb36b7ec42 ("drm/msm: Add a common
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
between commits:
0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable() helper function")
64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
between commits:
0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable() helper function")
64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to
7 matches
Mail list logo
