From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753756AbbFXO7G (ORCPT ); Wed, 24 Jun 2015 10:59:06 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:53916 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667AbbFXO6U (ORCPT ); Wed, 24 Jun 2015 10:58:20 -0400 Date: Wed, 24 Jun 2015 07:58:18 -0700 From: Greg Kroah-Hartman To: Jani Nikula Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Chris Wilson Subject: Re: [PATCH 4.0 077/105] drm/i915: Dont skip request retirement if the active list is empty Message-ID: <20150624145818.GD25842@kroah.com> References: <20150619203558.187802739@linuxfoundation.org> <20150619203600.449494173@linuxfoundation.org> <87h9py288m.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87h9py288m.fsf@intel.com> User-Agent: Mutt/1.5.23+89 (0255b37be491) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53916 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667AbbFXO6U (ORCPT ); Wed, 24 Jun 2015 10:58:20 -0400 Date: Wed, 24 Jun 2015 07:58:18 -0700 From: Greg Kroah-Hartman To: Jani Nikula Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Chris Wilson Subject: Re: [PATCH 4.0 077/105] drm/i915: Dont skip request retirement if the active list is empty Message-ID: <20150624145818.GD25842@kroah.com> References: <20150619203558.187802739@linuxfoundation.org> <20150619203600.449494173@linuxfoundation.org> <87h9py288m.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87h9py288m.fsf@intel.com> Sender: stable-owner@vger.kernel.org List-ID: 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, greg k-h