From: Jani Nikula <jani.nikula@intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: Fixes that failed to backport to v4.12-rc1
Date: Thu, 08 Jun 2017 17:47:23 +0300 [thread overview]
Message-ID: <87efuuedtw.fsf@intel.com> (raw)
In-Reply-To: <20170608143031.GR12629@intel.com>
On Thu, 08 Jun 2017, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, Jun 07, 2017 at 04:45:07PM +0300, Jani Nikula wrote:
>> On Mon, 15 May 2017, Jani Nikula <jani.nikula@intel.com> wrote:
>> > The following commits have been marked as Cc: stable or fixing something
>> > in v4.12-rc1 or earlier, but failed to cherry-pick to
>> > drm-intel-fixes. Please see if they are worth backporting, and please do
>> > so if they are.
>>
>> Update:
>>
>> d96a7d2adb04 ("drm/i915: Fix scaling check for 90/270 degree plane rotation")
>> fce5adf568ab ("drm/i915: Fix SKL+ watermarks for 90/270 rotation")
>>
>> I am about to pick up 73714c05df97 ("drm/i915: Fix 90/270 rotated
>> coordinates for FBC") which does apply cleanly - does it make sense
>> without the other two?
>
> Probably not. Shouldn't be too hard for me to fix up the other two
> since I already resolved the same conflicts in the other direction
> when applying the patches ;)
Whoops, I already sent the pull request without the two. Anything bad in
me queuing the backports you provided in the next -rc? Or should I
recall the pull request to include these two at the same time?
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-06-08 14:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 12:43 Fixes that failed to backport to v4.12-rc1 Jani Nikula
2017-06-07 13:45 ` Jani Nikula
2017-06-08 14:30 ` Ville Syrjälä
2017-06-08 14:47 ` Jani Nikula [this message]
2017-06-08 16:00 ` Ville Syrjälä
2017-06-13 8:30 ` Jani Nikula
2017-06-08 14:40 ` [PATCH fixes 1/2] drm/i915: Fix scaling check for 90/270 degree plane rotation ville.syrjala
2017-06-08 14:40 ` [PATCH fixes 2/2] drm/i915: Fix SKL+ watermarks for 90/270 rotation ville.syrjala
2017-06-13 8:27 ` Fixes that failed to backport to v4.12-rc1 Jani Nikula
2017-06-13 17:12 ` Michel Thierry
2017-06-15 13:11 ` [PATCH] drm/i915: Differentiate between sw write location into ring and last hw read Chris Wilson
2017-06-19 8:21 ` Jani Nikula
2017-06-19 9:02 ` Fixes that failed to backport to v4.12-rc1 Jani Nikula
2017-06-19 18:08 ` [PATCH] drm/i915: Don't enable backlight at setup time Dhinakaran Pandiyan
2017-06-19 18:13 ` Pandiyan, Dhinakaran
2017-06-19 19:35 ` Jani Nikula
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=87efuuedtw.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.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 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).