From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree
Date: Mon, 14 Dec 2015 12:06:49 +1100 [thread overview]
Message-ID: <20151214120649.00a5ee7b@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/intel_dp.c
between commit:
893da0c9bcb2 ("drm/i915: check for return value")
from the drm-intel tree and commit:
13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/i915/intel_dp.c
index ae4c21febbb5,9b10526cc6dd..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -6009,9 -5976,8 +6009,9 @@@ intel_dp_init(struct drm_device *dev
intel_encoder = &intel_dig_port->base;
encoder = &intel_encoder->base;
- drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
- DRM_MODE_ENCODER_TMDS, NULL);
+ if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
- DRM_MODE_ENCODER_TMDS))
++ DRM_MODE_ENCODER_TMDS, NULL))
+ goto err_encoder_init;
intel_encoder->compute_config = intel_dp_compute_config;
intel_encoder->disable = intel_disable_dp;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2015-12-14 1:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 1:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 3:34 linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell
2020-04-15 1:52 Stephen Rothwell
2019-08-20 2:19 Stephen Rothwell
2019-05-22 23:58 Stephen Rothwell
2019-05-22 23:53 Stephen Rothwell
2019-03-19 0:51 Stephen Rothwell
2019-01-16 1:27 Stephen Rothwell
2017-07-20 1:23 Stephen Rothwell
2017-07-21 0:11 ` Stephen Rothwell
2017-05-23 2:00 Stephen Rothwell
2017-05-25 1:53 ` Stephen Rothwell
2017-03-06 23:48 Stephen Rothwell
2017-01-03 2:14 Stephen Rothwell
2017-01-03 2:08 Stephen Rothwell
2017-01-03 1:59 Stephen Rothwell
2017-01-03 1:50 Stephen Rothwell
2016-10-23 23:59 Stephen Rothwell
2016-05-03 3:24 Stephen Rothwell
2016-05-03 7:54 ` Daniel Vetter
2016-04-27 2:32 Stephen Rothwell
2015-10-15 2:04 Stephen Rothwell
2015-09-29 1:26 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=20151214120649.00a5ee7b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sudipm.mukherjee@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).