2017-12-07 20:16:10

by Ben Hutchings

[permalink] [raw]
Subject: Re: [PATCH 4.4 78/96] drm/armada: Fix compile fail

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 <[email protected]>
>
>
> [ 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.

Ben.

--
Ben Hutchings
Software Developer, Codethink Ltd.


Subject: Re: [PATCH 4.4 78/96] drm/armada: Fix compile fail

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 <[email protected]>
>>
>>
>> [ 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