From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Lee Jones <lee.jones@linaro.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
"Nikula, Jani" <jani.nikula@linux.intel.com>,
joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
DRI Development <dri-devel@lists.freedesktop.org>,
Linux-Next <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Neil Armstrong <narmstrong@baylibre.com>,
paulo.r.zanoni@intel.com
Subject: Re: linux-next: manual merge of the mfd tree with the drm-intel tree
Date: Tue, 21 Aug 2018 10:27:48 +0200 [thread overview]
Message-ID: <CAMuHMdXtMer6z09GV4HM++0RjYSkLWaXO9-m==SE85RkQ2xP-g@mail.gmail.com> (raw)
In-Reply-To: <20180816121256.0435930e@canb.auug.org.au>
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
next prev parent reply other threads:[~2018-08-21 8:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 5:10 linux-next: manual merge of the mfd tree with the drm-intel tree Stephen Rothwell
2018-08-16 2:12 ` Stephen Rothwell
2018-08-21 8:27 ` Geert Uytterhoeven [this message]
2018-08-21 8:33 ` 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='CAMuHMdXtMer6z09GV4HM++0RjYSkLWaXO9-m==SE85RkQ2xP-g@mail.gmail.com' \
--to=geert@linux-m68k.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=narmstrong@baylibre.com \
--cc=paulo.r.zanoni@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=sfr@canb.auug.org.au \
/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 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).