From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44997 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727839AbeILXtf (ORCPT ); Wed, 12 Sep 2018 19:49:35 -0400 Date: Wed, 12 Sep 2018 20:43:35 +0200 From: Greg KH To: Michel =?iso-8859-1?Q?D=E4nzer?= Cc: stable@vger.kernel.org Subject: Re: Nomination of amdgpu fixes for stable backport Message-ID: <20180912184335.GD10317@kroah.com> References: <20180912085508.GA24353@kroah.com> <8c5a55ec-9b46-6698-6d82-108d8d42a11f@daenzer.net> <20180912091658.GA4598@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: stable-owner@vger.kernel.org List-ID: On Wed, Sep 12, 2018 at 11:28:01AM +0200, Michel D�nzer wrote: > On 2018-09-12 11:16 a.m., Greg KH wrote: > > On Wed, Sep 12, 2018 at 11:11:54AM +0200, Michel D�nzer wrote: > >> On 2018-09-12 10:55 a.m., Greg KH wrote: > >>> On Thu, Aug 16, 2018 at 09:53:54AM +0200, Michel D�nzer wrote: > >>>> > >>>> Hi stable kernel maintainers, > >>>> > >>>> > >>>> please squash these amdgpu fixes together and backport them to all > >>>> applicable stable branches: > >>>> > >>>> 15e6b76880e65be24250e30986084b5569b7a06f "drm/amdgpu: Warn and update > >>>> pin_size values when > >>>> destroying a pinned BO" > >>>> 456607d816d89a442a3d5ec98b02c8bc950b5228 "drm/amdgpu: Don't warn on > >>>> destroying a pinned BO" > >>>> > >>>> (These depend on commits a5ccfe5c20740f2fbf00291490cdf8d2373ec255 and > >>>> ddc21af4d0f37f42b33c54cb69b215997fe5b082, which already have Cc: stable) > >>> > >>> Those commits did not apply to the stable tree, so can you please send a > >>> series of patches that do apply so that I can queue all of these up > >>> properly? > >> > >> Just keep the > >> > >> if (adev->gmc.visible_vram_size == adev->gmc.real_vram_size) > >> > >> line in the backport of ddc21af4d0f37f42b33c54cb69b215997fe5b082. The > >> remaining 3 should apply fine AFAICT. > > > > Can you provide a patch that does that? I don't have the resources to > > hand-edit diffs in order to get them to apply. I also, almost always, > > when I have tried to do this, get it wrong :) > > Sure, attached. Sorry about the trouble, the conflict was due to a > helper function added upstream. Thanks for the backport, all are now queued up. greg k-h