linux-next: manual merge of the mfd tree with the drm-intel tree

linux-next: manual merge of the mfd tree with the drm-intel tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1803 bytes --]

Hi Lee,

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

  drivers/gpu/drm/i915/intel_display.h

between commit:

  6075546f57f8 ("drm/i915/icl: store the port type for TC ports")

from the drm-intel tree and commit:

  9c229127aee2 ("drm/i915: hdmi: add CEC notifier to intel_hdmi")

from the mfd 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 drivers/gpu/drm/i915/intel_display.h
index 0a79a46d5805,1f176a71e081..000000000000
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@@ -126,24 -126,30 +126,48 @@@ enum port 
  
  #define port_name(p) ((p) + 'A')
  
+ /*
+  * Ports identifier referenced from other drivers.
+  * Expected to remain stable over time
+  */
+ static inline const char *port_identifier(enum port port)
+ {
+ 	switch (port) {
+ 	case PORT_A:
+ 		return "Port A";
+ 	case PORT_B:
+ 		return "Port B";
+ 	case PORT_C:
+ 		return "Port C";
+ 	case PORT_D:
+ 		return "Port D";
+ 	case PORT_E:
+ 		return "Port E";
+ 	case PORT_F:
+ 		return "Port F";
+ 	default:
+ 		return "<invalid>";
+ 	}
+ }
+ 
 +enum tc_port {
 +	PORT_TC_NONE = -1,
 +
 +	PORT_TC1 = 0,
 +	PORT_TC2,
 +	PORT_TC3,
 +	PORT_TC4,
 +
 +	I915_MAX_TC_PORTS
 +};
 +
 +enum tc_port_type {
 +	TC_PORT_UNKNOWN = 0,
 +	TC_PORT_TYPEC,
 +	TC_PORT_TBT,
 +	TC_PORT_LEGACY,
 +};
 +
  enum dpio_channel {
  	DPIO_CH0,
  	DPIO_CH1

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with the drm-intel tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2143 bytes --]

Hi all,

On Thu, 26 Jul 2018 15:10:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/gpu/drm/i915/intel_display.h
> 
> between commit:
> 
>   6075546f57f8 ("drm/i915/icl: store the port type for TC ports")
> 
> from the drm-intel tree and commit:
> 
>   9c229127aee2 ("drm/i915: hdmi: add CEC notifier to intel_hdmi")
> 
> from the mfd 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 drivers/gpu/drm/i915/intel_display.h
> index 0a79a46d5805,1f176a71e081..000000000000
> --- a/drivers/gpu/drm/i915/intel_display.h
> +++ b/drivers/gpu/drm/i915/intel_display.h
> @@@ -126,24 -126,30 +126,48 @@@ enum port 
>   
>   #define port_name(p) ((p) + 'A')
>   
> + /*
> +  * Ports identifier referenced from other drivers.
> +  * Expected to remain stable over time
> +  */
> + static inline const char *port_identifier(enum port port)
> + {
> + 	switch (port) {
> + 	case PORT_A:
> + 		return "Port A";
> + 	case PORT_B:
> + 		return "Port B";
> + 	case PORT_C:
> + 		return "Port C";
> + 	case PORT_D:
> + 		return "Port D";
> + 	case PORT_E:
> + 		return "Port E";
> + 	case PORT_F:
> + 		return "Port F";
> + 	default:
> + 		return "<invalid>";
> + 	}
> + }
> + 
>  +enum tc_port {
>  +	PORT_TC_NONE = -1,
>  +
>  +	PORT_TC1 = 0,
>  +	PORT_TC2,
>  +	PORT_TC3,
>  +	PORT_TC4,
>  +
>  +	I915_MAX_TC_PORTS
>  +};
>  +
>  +enum tc_port_type {
>  +	TC_PORT_UNKNOWN = 0,
>  +	TC_PORT_TYPEC,
>  +	TC_PORT_TBT,
>  +	TC_PORT_LEGACY,
>  +};
>  +
>   enum dpio_channel {
>   	DPIO_CH0,
>   	DPIO_CH1

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with the drm-intel tree

[Geert Uytterhoeven]

On Thu, Aug 16, 2018 at 8:05 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Thu, 26 Jul 2018 15:10:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the mfd tree got a conflict in:
> >
> >   drivers/gpu/drm/i915/intel_display.h
> >
> > between commit:
> >
> >   6075546f57f8 ("drm/i915/icl: store the port type for TC ports")
> >
> > from the drm-intel tree and commit:
> >
> >   9c229127aee2 ("drm/i915: hdmi: add CEC notifier to intel_hdmi")
> >
> > from the mfd 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 drivers/gpu/drm/i915/intel_display.h
> > index 0a79a46d5805,1f176a71e081..000000000000
> > --- a/drivers/gpu/drm/i915/intel_display.h
> > +++ b/drivers/gpu/drm/i915/intel_display.h
> > @@@ -126,24 -126,30 +126,48 @@@ enum port
> >
> >   #define port_name(p) ((p) + 'A')
> >
> > + /*
> > +  * Ports identifier referenced from other drivers.
> > +  * Expected to remain stable over time
> > +  */
> > + static inline const char *port_identifier(enum port port)
> > + {
> > +     switch (port) {
> > +     case PORT_A:
> > +             return "Port A";
> > +     case PORT_B:
> > +             return "Port B";
> > +     case PORT_C:
> > +             return "Port C";
> > +     case PORT_D:
> > +             return "Port D";
> > +     case PORT_E:
> > +             return "Port E";
> > +     case PORT_F:
> > +             return "Port F";
> > +     default:
> > +             return "<invalid>";
> > +     }
> > + }
> > +
> >  +enum tc_port {
> >  +    PORT_TC_NONE = -1,
> >  +
> >  +    PORT_TC1 = 0,
> >  +    PORT_TC2,
> >  +    PORT_TC3,
> >  +    PORT_TC4,
> >  +
> >  +    I915_MAX_TC_PORTS
> >  +};
> >  +
> >  +enum tc_port_type {
> >  +    TC_PORT_UNKNOWN = 0,
> >  +    TC_PORT_TYPEC,
> >  +    TC_PORT_TBT,
> >  +    TC_PORT_LEGACY,
> >  +};
> >  +
> >   enum dpio_channel {
> >       DPIO_CH0,
> >       DPIO_CH1
>
> This is now a conflict between Linus' tree and the mfd tree.

FTR, it's not this one, but the similar one reported on Jul 19, which does not
add the tc_port_type enum.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: linux-next: manual merge of the mfd tree with the drm-intel tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

Hi Geert,

On Tue, 21 Aug 2018 10:27:48 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> 
> FTR, it's not this one, but the similar one reported on Jul 19, which does not
> add the tc_port_type enum.

Right, sorry about that.  Linus has now merged the mfd tree so things
are probably done now.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]