Hi all,
Today's linux-next merge of the drm-msm tree got conflicts in:
drivers/gpu/drm/msm/edp/edp.h
drivers/gpu/drm/msm/edp/edp_ctrl.c
between commit:
da68386d9edb ("drm: Rename dp/ to display/")
from the drm tree and commit:
f1fc2b87de47 ("drm/msm: drop old eDP block support (again)
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/Kconfig
between commit:
1e0f66420b13 ("drm/display: Introduce a DRM display-helper module")
from the drm tree and commit:
f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support")
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/msm_gem_submit.c
between commit:
0e10e9a1db23 ("drm/sched: drop entity parameter from drm_sched_push_job")
from the drm tree and commit:
68002469e571 ("drm/msm: One sched entity per process per p
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")
fr
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 th
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 tree.
Hi all,
Today's linux-next merge of the drm-msm tree got conflicts in:
drivers/gpu/drm/msm/edp/edp.c
drivers/gpu/drm/msm/hdmi/hdmi.c
between commit:
a25b988ff83f ("drm/bridge: Extend bridge API to disable connector creation")
from the drm tree and commit:
c479017faa3a ("drm/msm: avoid
Hi all,
On Wed, 14 Aug 2019 12:58:59 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-msm tree got a conflict in:
>
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>
> between commit:
>
> e78ad7654179 ("drm/msm: Use drm_gem_fb_prepare_fb")
>
> from the drm tree and commi
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
between commit:
e78ad7654179 ("drm/msm: Use drm_gem_fb_prepare_fb")
from the drm tree and commit:
ddc73f32ba95 ("drm/msm: drop use of drmP.h")
from the drm-msm tree.
I fix
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 Rob,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/dsi/dsi_manager.c
between commit:
97e14fbeb53f ("drm: drop _mode_ from remaining connector functions")
from the drm tree and commit:
b6a221993e7c ("drm/msm/dsi: Use one connector for dual DSI mod
12 matches
Mail list logo
