lkml.org 
[lkml]   [2020]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the drm tree with the omap tree
    Hi all,

    On Wed, 18 Mar 2020 13:50:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    >
    > Today's linux-next merge of the drm tree got a conflict in:
    >
    > arch/arm/configs/omap2plus_defconfig
    >
    > between commit:
    >
    > 98c2cc359f8f ("ARM: omap2plus_defconfig: Update for moved and dropped options")
    >
    > from the omap tree and commit:
    >
    > e7e67d9a2f1d ("drm/omap: Switch the HDMI and VENC outputs to drm_bridge")
    >
    > from the drm tree.
    >
    > I fixed it up (see below) and can carry the fix as necessary. This
    > is now fixed as far as linux-next is concerned, but any non trivial
    > conflicts should be mentioned to your upstream maintainer when your tree
    > is submitted for merging. You may also want to consider cooperating
    > with the maintainer of the conflicting tree to minimise any particularly
    > complex conflicts.
    >
    > --
    > Cheers,
    > Stephen Rothwell
    >
    > diff --cc arch/arm/configs/omap2plus_defconfig
    > index eedb26ff93f9,54f1a21de7e0..000000000000
    > --- a/arch/arm/configs/omap2plus_defconfig
    > +++ b/arch/arm/configs/omap2plus_defconfig
    > @@@ -360,10 -353,10 +360,9 @@@ CONFIG_OMAP2_DSS_DSI=
    > CONFIG_DRM_OMAP_PANEL_DSI_CM=m
    > CONFIG_DRM_TILCDC=m
    > CONFIG_DRM_PANEL_SIMPLE=m
    > + CONFIG_DRM_DISPLAY_CONNECTOR=m
    > + CONFIG_DRM_SIMPLE_BRIDGE=m
    > -CONFIG_DRM_TI_TFP410=m
    > + CONFIG_DRM_TI_TPD12S015=m
    > CONFIG_DRM_PANEL_LG_LB035Q02=m
    > CONFIG_DRM_PANEL_NEC_NL8048HL11=m
    > CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m

    This is now a conflict between the arm-soc tree and Linus' tree.

    --
    Cheers,
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2020-04-03 01:08    [W:2.163 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site