From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>, Dave Airlie <airlied@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI mailing list <dri-devel@lists.freedesktop.org>
Subject: Re: [git pull] drm urgent fix
Date: Thu, 26 Mar 2015 14:13:51 +0200 [thread overview]
Message-ID: <871tkcrm68.fsf@intel.com> (raw)
In-Reply-To: <CAKMK7uFu=wKnCxg4vHsFbb1-FOYWzm3dKFfhh48=+uCF2nMiqQ@mail.gmail.com>
On Thu, 26 Mar 2015, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Thu, Mar 26, 2015 at 4:29 AM, Dave Airlie <airlied@gmail.com> wrote:
>> I've pushed a drm-fixes-staging branch that backport's Daniel's
>> drm-next fix from 9 hours ago,
>>
>> However it isn't tested yet, so if you want to give it a whirl grab it.
>>
>> Hopefully when Daniel comes on line he can provide assurance that my
>> fix is a correct backport.
>
> Your missing the backport of
>
> commit fb9981aa675eb7b398849915364916fd98833cfa
> Author: Damien Lespiau <damien.lespiau@intel.com>
> Date: Thu Feb 5 19:24:25 2015 +0000
>
> drm/i915: Fix atomic state when reusing the firmware fb
>
> My manual backport is here
>
> http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg854137.html
>
> The backport of the other patch you have in -staging looks fine.
The drm-intel-fixes pull request I just sent [1] covers both of
these. It's on top of drm-fixes, i.e. superseeds -staging.
BR,
Jani.
[1] http://mid.gmane.org/87egocrmyc.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
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>, Dave Airlie <airlied@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI mailing list <dri-devel@lists.freedesktop.org>
Subject: Re: [git pull] drm urgent fix
Date: Thu, 26 Mar 2015 14:13:51 +0200 [thread overview]
Message-ID: <871tkcrm68.fsf@intel.com> (raw)
In-Reply-To: <CAKMK7uFu=wKnCxg4vHsFbb1-FOYWzm3dKFfhh48=+uCF2nMiqQ@mail.gmail.com>
On Thu, 26 Mar 2015, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Thu, Mar 26, 2015 at 4:29 AM, Dave Airlie <airlied@gmail.com> wrote:
>> I've pushed a drm-fixes-staging branch that backport's Daniel's
>> drm-next fix from 9 hours ago,
>>
>> However it isn't tested yet, so if you want to give it a whirl grab it.
>>
>> Hopefully when Daniel comes on line he can provide assurance that my
>> fix is a correct backport.
>
> Your missing the backport of
>
> commit fb9981aa675eb7b398849915364916fd98833cfa
> Author: Damien Lespiau <damien.lespiau@intel.com>
> Date: Thu Feb 5 19:24:25 2015 +0000
>
> drm/i915: Fix atomic state when reusing the firmware fb
>
> My manual backport is here
>
> http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg854137.html
>
> The backport of the other patch you have in -staging looks fine.
The drm-intel-fixes pull request I just sent [1] covers both of
these. It's on top of drm-fixes, i.e. superseeds -staging.
BR,
Jani.
[1] http://mid.gmane.org/87egocrmyc.fsf@intel.com
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2015-03-26 12:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 2:11 [git pull] drm urgent fix Dave Airlie
2015-03-24 23:48 ` Linus Torvalds
2015-03-24 23:48 ` Linus Torvalds
2015-03-25 0:04 ` Dave Airlie
2015-03-25 0:04 ` Dave Airlie
2015-03-25 9:06 ` Daniel Vetter
2015-03-25 9:06 ` Daniel Vetter
2015-03-25 22:43 ` Linus Torvalds
2015-03-25 22:43 ` Linus Torvalds
2015-03-26 3:04 ` Linus Torvalds
2015-03-26 3:04 ` Linus Torvalds
2015-03-26 3:29 ` Dave Airlie
2015-03-26 3:29 ` Dave Airlie
2015-03-26 7:59 ` Daniel Vetter
2015-03-26 7:59 ` Daniel Vetter
2015-03-26 12:13 ` Jani Nikula [this message]
2015-03-26 12:13 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2012-12-19 21:56 Dave Airlie
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=871tkcrm68.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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.