* linux-next: manual merge of the drm tree with the omap tree
@ 2020-03-18 2:50 Stephen Rothwell
2020-03-18 16:55 ` Tony Lindgren
2020-04-02 23:08 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-03-18 2:50 UTC (permalink / raw)
To: Dave Airlie, DRI, Tony Lindgren
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Laurent Pinchart, Tomi Valkeinen
[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]
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.
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the drm tree with the omap tree
2020-03-18 2:50 linux-next: manual merge of the drm tree with the omap tree Stephen Rothwell
@ 2020-03-18 16:55 ` Tony Lindgren
2020-04-02 23:08 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2020-03-18 16:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Laurent Pinchart, Tomi Valkeinen
* 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the drm tree with the omap tree
2020-03-18 2:50 linux-next: manual merge of the drm tree with the omap tree Stephen Rothwell
2020-03-18 16:55 ` Tony Lindgren
@ 2020-04-02 23:08 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-04-02 23:08 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM
Cc: Dave Airlie, DRI, Tony Lindgren, Linux Next Mailing List,
Linux Kernel Mailing List, Laurent Pinchart, Tomi Valkeinen
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-02 23:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-18 2:50 linux-next: manual merge of the drm tree with the omap tree Stephen Rothwell
2020-03-18 16:55 ` Tony Lindgren
2020-04-02 23:08 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).