From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Imre Deak <imre.deak@intel.com>
Subject: Re: linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree
Date: Mon, 29 Jul 2019 10:31:33 +1000 [thread overview]
Message-ID: <20190729103133.5a3deb85@canb.auug.org.au> (raw)
In-Reply-To: <20190723110331.1967d000@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]
Hi all,
On Tue, 23 Jul 2019 11:03:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_dp.c
>
> between commit:
>
> b6ac32eac063 ("drm/i915: Mark expected switch fall-throughs")
This is now commit
2defb94edb44 (""drm/i915: Mark expected switch fall-throughs")
from Linus' tree.
> from the kspp-gustavo tree and commit:
>
> bc85328ff431 ("drm/i915: Move the TypeC port handling code to a separate file")
> 4f36afb26cbe ("drm/i915: Sanitize the TypeC FIA lane configuration decoding")
>
> from the drm-intel tree.
>
> I fixed it up (bc85328ff431 moved the function updated by b6ac32eac063
> and 4f36afb26cbe added an equivalent fixup) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-07-29 0:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 1:03 linux-next: manual merge of the drm-intel tree with the kspp-gustavo tree Stephen Rothwell
2019-07-29 0:31 ` Stephen Rothwell [this message]
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=20190729103133.5a3deb85@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo@embeddedor.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
/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).