Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752043AbbFYPYk (ORCPT ); Thu, 25 Jun 2015 11:24:40 -0400 Received: from mga14.intel.com ([192.55.52.115]:63308 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786AbbFYPYe convert rfc822-to-8bit (ORCPT ); Thu, 25 Jun 2015 11:24:34 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,677,1427785200"; d="scan'208";a="750347092" From: Jani Nikula To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Ville =?utf-8?B?U3lyasOkbMOk?= , Chris Wilson Subject: Re: [PATCH 4.0 077/105] drm/i915: Dont skip request retirement if the active list is empty In-Reply-To: <20150625144839.GA20971@kroah.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20150619203558.187802739@linuxfoundation.org> <20150619203600.449494173@linuxfoundation.org> <87h9py288m.fsf@intel.com> <20150624145818.GD25842@kroah.com> <87zj3oz1f6.fsf@intel.com> <20150625144839.GA20971@kroah.com> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 25 Jun 2015 18:22:31 +0300 Message-ID: <87ioab7qyw.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1846 Lines: 47 On Thu, 25 Jun 2015, Greg Kroah-Hartman wrote: > On Thu, Jun 25, 2015 at 10:34:37AM +0300, Jani Nikula wrote: >> On Wed, 24 Jun 2015, Greg Kroah-Hartman wrote: >> > On Tue, Jun 23, 2015 at 10:29:13AM +0300, Jani Nikula wrote: >> >> On Fri, 19 Jun 2015, Greg Kroah-Hartman wrote: >> >> > 4.0-stable review patch. If anyone has any objections, please let me know. >> >> >> >> The commit to be backported is already reverted in upstream, and I just >> >> got an email from you backporting the revert as well... would be best to >> >> *not* backport either of these: >> >> >> >> commit 0aedb1626566efd72b369c01992ee7413c82a0c5 >> >> Author: Ville Syrjälä >> >> Date: Thu May 28 18:32:36 2015 +0300 >> >> >> >> drm/i915: Don't skip request retirement if the active list is empty >> >> >> >> commit 245ec9d85696c3e539b23e210f248698b478379c >> >> Author: Jani Nikula >> >> Date: Mon Jun 15 12:59:37 2015 +0300 >> >> >> >> Revert "drm/i915: Don't skip request retirement if the active list is empty" >> >> >> >> I only marked the revert cc: stable because the original was too. >> > >> > This patch is now in 4.0 so what do I suggest I do? Just take these as >> > well? >> > >> > confused, >> >> Sorry for confusing you. Please take neither or take both. > > So, based on what I have queued up, and what is already released in > 4.0-stable, we should be fine, right? Yes. Thanks. Jani. -- Jani Nikula, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/