Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree

["james qian wang (Arm Technology China)" <james.qian.wang@arm.com>]

On Mon, Aug 26, 2019 at 01:06:37PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the drm tree got a conflict in:
> 
>   drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> 
> between commit:
> 
>   51a44a28eefd ("drm/komeda: Add missing of_node_get() call")
> 
> from the drm-misc-fixes tree and commit:
> 
>   8965ad8433ea ("drm/komeda: Enable dual-link support")
> 
> 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.
>

Hi Stephen:
Sorry for the conflict, and thank you very much.

Regards
James
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> index 9d4d5075cc64,1ff7f4b2c620..000000000000
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> @@@ -127,7 -128,8 +129,8 @@@ static int komeda_parse_pipe_dt(struct 
>   	pipe->of_output_port =
>   		of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT);
>   
> + 	pipe->dual_link = pipe->of_output_links[0] && pipe->of_output_links[1];
>  -	pipe->of_node = np;
>  +	pipe->of_node = of_node_get(np);
>   
>   	return 0;
>   }