From: Jani Nikula <jani.nikula@intel.com>
To: "Mark Brown" <broonie@kernel.org>,
"Dave Airlie" <airlied@linux.ie>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Imre Deak" <imre.deak@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Thu, 03 Dec 2015 17:49:16 +0200 [thread overview]
Message-ID: <87h9jz1qir.fsf@intel.com> (raw)
In-Reply-To: <20151203145139.512bebac25c08506a1791a5b@kernel.org>
On Thu, 03 Dec 2015, Mark Brown <broonie@kernel.org> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
> Introduce a gmbus power domain") from the drm-intel-fixes tree and commit
> 69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
> during HDMI detect") from the drm tree.
>
> I fixed it up (again resulting in a null diff) and can carry the fix as
> necessary (no action is required).
Both of these were due to backporting of five patches from our -next
aiming at v4.5 to our -fixes aiming at v4.4. Some more details in my
pull request to Dave [1].
BR,
Jani.
[1] http://mid.gmane.org/87mvtr1t6n.fsf@intel.com
--
Jani Nikula, Intel Open Source Technology Center
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: "Mark Brown" <broonie@kernel.org>,
"Dave Airlie" <airlied@linux.ie>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Imre Deak" <imre.deak@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Thu, 03 Dec 2015 17:49:16 +0200 [thread overview]
Message-ID: <87h9jz1qir.fsf@intel.com> (raw)
In-Reply-To: <20151203145139.512bebac25c08506a1791a5b@kernel.org>
On Thu, 03 Dec 2015, Mark Brown <broonie@kernel.org> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
> Introduce a gmbus power domain") from the drm-intel-fixes tree and commit
> 69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
> during HDMI detect") from the drm tree.
>
> I fixed it up (again resulting in a null diff) and can carry the fix as
> necessary (no action is required).
Both of these were due to backporting of five patches from our -next
aiming at v4.5 to our -fixes aiming at v4.4. Some more details in my
pull request to Dave [1].
BR,
Jani.
[1] http://mid.gmane.org/87mvtr1t6n.fsf@intel.com
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-12-03 15:50 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 14:51 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Mark Brown
2015-12-03 15:49 ` Jani Nikula [this message]
2015-12-03 15:49 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 2:10 Stephen Rothwell
2024-03-07 8:27 ` Joonas Lahtinen
2023-04-17 14:39 broonie
2023-04-17 14:39 ` broonie
2022-05-17 1:26 Stephen Rothwell
2022-05-17 1:26 ` Stephen Rothwell
2022-02-25 16:14 broonie
2022-02-25 16:14 ` broonie
2022-02-22 17:03 broonie
2022-02-22 17:03 ` broonie
2020-05-08 3:50 Stephen Rothwell
2020-05-08 3:50 ` Stephen Rothwell
2020-05-07 2:43 Stephen Rothwell
2020-05-07 2:43 ` Stephen Rothwell
2020-01-22 0:37 Stephen Rothwell
2020-01-22 0:37 ` Stephen Rothwell
2020-01-08 1:15 Stephen Rothwell
2020-01-08 1:15 ` Stephen Rothwell
2020-01-08 1:10 Stephen Rothwell
2020-01-08 1:10 ` Stephen Rothwell
2020-01-08 1:04 Stephen Rothwell
2020-01-08 1:04 ` Stephen Rothwell
2020-01-08 2:28 ` Stephen Rothwell
2020-01-08 2:28 ` Stephen Rothwell
2019-10-31 0:33 Stephen Rothwell
2019-10-31 0:33 ` Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2018-01-05 1:00 Stephen Rothwell
2018-01-05 1:00 ` Stephen Rothwell
2017-07-21 1:26 Stephen Rothwell
2017-07-21 1:26 ` Stephen Rothwell
2017-06-14 0:56 Stephen Rothwell
2017-06-14 0:56 ` Stephen Rothwell
2017-06-14 0:50 Stephen Rothwell
2017-06-09 2:26 Stephen Rothwell
2017-06-08 2:53 Stephen Rothwell
2017-06-08 2:53 ` Stephen Rothwell
2017-03-30 1:14 Stephen Rothwell
2017-03-30 1:08 Stephen Rothwell
2017-03-30 1:08 ` Stephen Rothwell
2017-03-22 0:00 Stephen Rothwell
2017-03-22 0:00 ` Stephen Rothwell
2017-03-27 17:14 ` Paul McKenney
2017-03-21 23:57 Stephen Rothwell
2017-03-21 23:57 ` Stephen Rothwell
2017-03-21 0:28 Stephen Rothwell
2017-03-21 0:28 ` Stephen Rothwell
2016-06-14 2:10 Stephen Rothwell
2016-06-14 2:10 ` Stephen Rothwell
2015-12-22 23:06 Stephen Rothwell
2015-12-22 23:06 ` Stephen Rothwell
2015-12-09 2:35 Stephen Rothwell
2015-12-09 2:35 ` Stephen Rothwell
2015-12-03 14:47 Mark Brown
2015-12-03 14:52 ` Imre Deak
2015-08-17 3:23 Stephen Rothwell
2015-08-17 3:23 ` Stephen Rothwell
2015-06-05 5:46 mpe@ellerman.id.au
2015-06-05 8:03 ` Jani Nikula
2015-06-05 8:03 ` Jani Nikula
2015-06-09 1:58 ` Stephen Rothwell
2015-06-09 1:58 ` Stephen Rothwell
2015-03-16 2:30 Stephen Rothwell
2015-03-16 2:30 ` Stephen Rothwell
2015-03-16 13:43 ` Xi Ruoyao
2015-03-16 15:04 ` Jani Nikula
2014-12-03 2:27 Stephen Rothwell
2014-12-03 2:27 ` Stephen Rothwell
2014-12-03 8:24 ` Jani Nikula
2014-12-03 8:24 ` Jani Nikula
2014-12-03 8:28 ` Stephen Rothwell
2014-11-17 3:04 Stephen Rothwell
2014-11-17 3:04 ` Stephen Rothwell
2014-07-23 2:38 Stephen Rothwell
2014-07-23 2:38 ` Stephen Rothwell
2014-07-09 4:06 Stephen Rothwell
2014-05-22 5:44 Stephen Rothwell
2014-05-22 5:40 Stephen Rothwell
2014-05-07 3:24 Stephen Rothwell
2013-10-28 5:46 Stephen Rothwell
2013-10-28 5:46 ` Stephen Rothwell
2013-10-28 6:12 ` Stephen Rothwell
2013-10-28 6:12 ` 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=87h9jz1qir.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@linux.ie \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=imre.deak@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.