From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Clark <robdclark@gmail.com>, Dave Airlie <airlied@linux.ie>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Archit Taneja <architt@codeaurora.org>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: linux-next: manual merge of the drm-msm tree with the drm tree
Date: Thu, 3 Aug 2017 13:03:01 +1000 [thread overview]
Message-ID: <20170803130301.0ace5a56@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
between commits:
0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable() helper function")
64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to .atomic_disable()")
from the drm tree and commit:
710e7a448783 ("drm/msm/mdp5: Don't use mode_set helper funcs for encoders and CRTCs")
from the drm-msm 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/msm/mdp/mdp5/mdp5_crtc.c
index 4322a502555a,aefe6d2cfa94..000000000000
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@@ -940,7 -954,8 +956,6 @@@ static const struct drm_crtc_funcs mdp5
};
static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = {
- .mode_set_nofb = mdp5_crtc_mode_set_nofb,
- .disable = mdp5_crtc_disable,
- .enable = mdp5_crtc_enable,
.atomic_check = mdp5_crtc_atomic_check,
.atomic_begin = mdp5_crtc_atomic_begin,
.atomic_flush = mdp5_crtc_atomic_flush,
next reply other threads:[~2017-08-03 3:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-03 3:03 Stephen Rothwell [this message]
2018-07-23 2:40 linux-next: manual merge of the drm-msm tree with the drm tree Stephen Rothwell
2018-12-10 3:03 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=20170803130301.0ace5a56@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=architt@codeaurora.org \
--cc=daniel.vetter@ffwll.ch \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robdclark@gmail.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).