From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: Re: linux-next: manual merge of the drm tree with the omap tree
Date: Wed, 18 Mar 2020 09:55:17 -0700 [thread overview]
Message-ID: <20200318165517.GO37466@atomide.com> (raw)
In-Reply-To: <20200318135034.242d9edf@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [200318 02:51]:
> Hi all,
>
> 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.
OK thanks!
Tony
> 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
WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Airlie <airlied@linux.ie>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: Re: linux-next: manual merge of the drm tree with the omap tree
Date: Wed, 18 Mar 2020 09:55:17 -0700 [thread overview]
Message-ID: <20200318165517.GO37466@atomide.com> (raw)
In-Reply-To: <20200318135034.242d9edf@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [200318 02:51]:
> Hi all,
>
> 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.
OK thanks!
Tony
> 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-03-18 16:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 2:50 linux-next: manual merge of the drm tree with the omap tree Stephen Rothwell
2020-03-18 2:50 ` Stephen Rothwell
2020-03-18 16:55 ` Tony Lindgren [this message]
2020-03-18 16:55 ` Tony Lindgren
2020-04-02 23:08 ` Stephen Rothwell
2020-04-02 23:08 ` Stephen Rothwell
2020-04-02 23:08 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200318165517.GO37466@atomide.com \
--to=tony@atomide.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.