From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbbCZMPC (ORCPT ); Thu, 26 Mar 2015 08:15:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:55039 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbbCZMPA (ORCPT ); Thu, 26 Mar 2015 08:15:00 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,471,1422950400"; d="scan'208";a="546657632" From: Jani Nikula To: Daniel Vetter , Dave Airlie Cc: Linus Torvalds , Linux Kernel Mailing List , DRI mailing list Subject: Re: [git pull] drm urgent fix In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: User-Agent: Notmuch/0.19+87~gcf99a78 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 26 Mar 2015 14:13:51 +0200 Message-ID: <871tkcrm68.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 26 Mar 2015, Daniel Vetter wrote: > On Thu, Mar 26, 2015 at 4:29 AM, Dave Airlie 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 > 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