From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregkh@linuxfoundation.org (Greg Kroah-Hartman) Date: Tue, 9 Sep 2014 08:38:44 -0700 Subject: [PATCH 0/2] Two imx-drm oops fixes In-Reply-To: <20140909151339.GA2341@dragon> References: <20140901170712.GJ30401@n2100.arm.linux.org.uk> <20140908190859.GA16374@kroah.com> <20140908190949.GB16374@kroah.com> <20140909151339.GA2341@dragon> Message-ID: <20140909153844.GA6117@kroah.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Sep 09, 2014 at 11:13:41PM +0800, Shawn Guo wrote: > On Mon, Sep 08, 2014 at 12:09:49PM -0700, Greg Kroah-Hartman wrote: > > On Mon, Sep 08, 2014 at 12:08:59PM -0700, Greg Kroah-Hartman wrote: > > > On Mon, Sep 01, 2014 at 06:07:12PM +0100, Russell King - ARM Linux wrote: > > > > Greg, > > > > > > > > Here's two oops fixes for imx-drm, which I've had queued up for a number > > > > of months now. Shawn posted different fixes for the same oops recently > > > > as well. > > > > > > So do I take your patches, or Shawn's? > > > > Actually, yours are "smaller", so I'll defer to you and take yours... > > Greg, > > My patch is bigger than Russell's because I cleaned up the code a little > bit along the way of fixing the bug. > > I will send you the cleanup as an incremental patch based on Russell's > fixes. That's what you should have done in the first place, don't try to do multiple things in the same patch, especially for bugfixes that need/want to be backported, you know better than that... greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: Re: [PATCH 0/2] Two imx-drm oops fixes Date: Tue, 9 Sep 2014 08:38:44 -0700 Message-ID: <20140909153844.GA6117@kroah.com> References: <20140901170712.GJ30401@n2100.arm.linux.org.uk> <20140908190859.GA16374@kroah.com> <20140908190949.GB16374@kroah.com> <20140909151339.GA2341@dragon> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20140909151339.GA2341@dragon> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org To: Shawn Guo Cc: devel@driverdev.osuosl.org, Russell King - ARM Linux , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Tue, Sep 09, 2014 at 11:13:41PM +0800, Shawn Guo wrote: > On Mon, Sep 08, 2014 at 12:09:49PM -0700, Greg Kroah-Hartman wrote: > > On Mon, Sep 08, 2014 at 12:08:59PM -0700, Greg Kroah-Hartman wrote: > > > On Mon, Sep 01, 2014 at 06:07:12PM +0100, Russell King - ARM Linux wrote: > > > > Greg, > > > > > > > > Here's two oops fixes for imx-drm, which I've had queued up for a number > > > > of months now. Shawn posted different fixes for the same oops recently > > > > as well. > > > > > > So do I take your patches, or Shawn's? > > > > Actually, yours are "smaller", so I'll defer to you and take yours... > > Greg, > > My patch is bigger than Russell's because I cleaned up the code a little > bit along the way of fixing the bug. > > I will send you the cleanup as an incremental patch based on Russell's > fixes. That's what you should have done in the first place, don't try to do multiple things in the same patch, especially for bugfixes that need/want to be backported, you know better than that... greg k-h