From: Mark Brown <broonie@kernel.org>
To: "Dave Airlie" <airlied@linux.ie>,
"Jani Nikula" <jani.nikula@intel.com>,
"Patrik Jakobsson" <patrik.jakobsson@linux.intel.com>,
"Imre Deak" <imre.deak@intel.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: linux-next: manual merge of the drm tree with the tree
Date: Thu, 3 Dec 2015 14:41:47 +0000 [thread overview]
Message-ID: <20151203144147.b0f3aef5c02437f44cae6a5d@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_runtime_pm.c between commit
ac9b8236551d11 ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit 73dfc227ff5c8e005 ("drm/i915/skl: init/uninit
display core as part of the HW power domain state") from the drm tree. It
also seems like the gmbus power domain commit has been added in both trees.
I fixed it up (resulting in an empty diff) and can carry the fix as necessary
(no action is required).
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
next reply other threads:[~2015-12-03 14:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 14:41 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-01-08 1:50 linux-next: manual merge of the drm tree with the tree Stephen Rothwell
2012-10-04 2:21 Stephen Rothwell
2010-03-02 3:36 Stephen Rothwell
2009-09-30 1:58 Stephen Rothwell
2009-08-20 5:27 Stephen Rothwell
2009-08-10 5:14 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=20151203144147.b0f3aef5c02437f44cae6a5d@kernel.org \
--to=broonie@kernel.org \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=imre.deak@intel.com \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=patrik.jakobsson@linux.intel.com \
--cc=ville.syrjala@linux.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).