linux-next: manual merge of the kspp tree with the drm-misc tree
diff mbox series

Message ID 20200703143550.7ebbe771@canb.auug.org.au
State New
Headers show
Series
  • linux-next: manual merge of the kspp tree with the drm-misc tree
Related show

Commit Message

Stephen Rothwell July 3, 2020, 4:35 a.m. UTC
Hi all,

Today's linux-next merge of the kspp tree got a conflict in:

  drivers/gpu/drm/drm_edid.c

between commit:

  948de84233d3 ("drm : Insert blank lines after declarations.")

from the drm-misc tree and commit:

  80b89ab785a4 ("treewide: Remove uninitialized_var() usage")

from the kspp 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.

Comments

Stephen Rothwell Aug. 5, 2020, 4:10 a.m. UTC | #1
Hi all,

On Fri, 3 Jul 2020 14:35:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   drivers/gpu/drm/drm_edid.c
> 
> between commit:
> 
>   948de84233d3 ("drm : Insert blank lines after declarations.")
> 
> from the drm-misc tree and commit:
> 
>   80b89ab785a4 ("treewide: Remove uninitialized_var() usage")
> 
> from the kspp 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.
> 
> diff --cc drivers/gpu/drm/drm_edid.c
> index 252e89cb54a3,b98fa573e706..000000000000
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@@ -3095,8 -3051,7 +3095,8 @@@ static int drm_cvt_modes(struct drm_con
>   	const u8 empty[3] = { 0, 0, 0 };
>   
>   	for (i = 0; i < 4; i++) {
> - 		int uninitialized_var(width), height;
> + 		int width, height;
>  +
>   		cvt = &(timing->data.other_data.data.cvt[i]);
>   
>   		if (!memcmp(cvt->code, empty, 3))

This is now a conflict between the drm tree and Linus' tree.

Patch
diff mbox series

diff --cc drivers/gpu/drm/drm_edid.c
index 252e89cb54a3,b98fa573e706..000000000000
--- a/drivers/gpu/drm/drm_edid.c