From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Clark <robdclark@gmail.com>, Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Chandan Uddaraju <chandanu@codeaurora.org>,
Sean Paul <seanpaul@chromium.org>
Subject: linux-next: manual merge of the drm-msm tree with the drm tree
Date: Mon, 23 Jul 2018 12:40:45 +1000 [thread overview]
Message-ID: <20180723124045.4346df97@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
Hi Rob,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/dsi/dsi_manager.c
between commit:
97e14fbeb53f ("drm: drop _mode_ from remaining connector functions")
from the drm tree and commit:
b6a221993e7c ("drm/msm/dsi: Use one connector for dual DSI mode")
from the drm-msm tree.
I fixed it up (the latter removed code modified by the former) 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 --]
next reply other threads:[~2018-07-23 2:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 2:40 Stephen Rothwell [this message]
2018-12-10 3:03 linux-next: manual merge of the drm-msm tree with the drm tree Stephen Rothwell
2019-08-14 2:58 Stephen Rothwell
2019-08-14 3:01 ` Stephen Rothwell
2020-03-20 0:40 Stephen Rothwell
2020-09-18 3:07 Stephen Rothwell
2020-09-21 3:07 Stephen Rothwell
2020-11-05 1:08 Stephen Rothwell
2020-11-05 1:12 Stephen Rothwell
2021-10-05 2:10 Stephen Rothwell
2022-05-05 1:01 Stephen Rothwell
2022-05-05 1:06 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=20180723124045.4346df97@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=chandanu@codeaurora.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.org \
/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).