Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751123AbdLIFlU (ORCPT ); Sat, 9 Dec 2017 00:41:20 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:16306 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750817AbdLIFlR (ORCPT ); Sat, 9 Dec 2017 00:41:17 -0500 From: alexander.levin@verizon.com X-Host: mariner.tdc.vzwcorp.com To: Ben Hutchings CC: Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" , Russell King , Chris Wilson , "Daniel Vetter" Subject: Re: [PATCH 4.4 78/96] drm/armada: Fix compile fail Thread-Topic: [PATCH 4.4 78/96] drm/armada: Fix compile fail Thread-Index: AQHTcLAmbKZowUyYnU+mElgfBws6sQ== Date: Sat, 9 Dec 2017 05:39:59 +0000 Message-ID: <20171209053951.ay7na6shlx6ry4co@sasha-lappy> References: <20171128100503.067621614@linuxfoundation.org> <20171128100507.939352650@linuxfoundation.org> <1512677765.18523.198.camel@codethink.co.uk> In-Reply-To: <1512677765.18523.198.camel@codethink.co.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: NeoMutt/20170113 (1.7.2) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" Content-ID: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vB95fQme016115 Content-Length: 796 Lines: 30 On Thu, Dec 07, 2017 at 08:16:05PM +0000, Ben Hutchings wrote: >On Tue, 2017-11-28 at 11:23 +0100, Greg Kroah-Hartman wrote: >> 4.4-stable review patch.??If anyone has any objections, please let me >> know. >> >> ------------------ >> >> From: Daniel Vetter >> >> >> [ Upstream commit 7357f89954b6d005df6ab8929759e78d7d9a80f9 ] >[...] >> --- a/drivers/gpu/drm/armada/Makefile >> +++ b/drivers/gpu/drm/armada/Makefile >> @@ -4,3 +4,5 @@ armada-y += armada_510.o >> ?armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o >> ? >> ?obj-$(CONFIG_DRM_ARMADA) := armada.o >> + >> +CFLAGS_armada_trace.o := -I$(src) > >The armada_trace.c source file was added in 4.10, so this makes no >sense in the 4.4 and 4.9 branches. I'll revert it for 4.4 and 4.9, thanks Ben! -- Thanks, Sasha