Re: [PATCH 01/11 v4] coresight: add CoreSight core layer framework

[Mathieu Poirier]

On 25 August 2014 02:24, Thomas Petazzoni
<thomas.petazzoni@xxxxxxxxxxxxxxxxxx> wrote:
> Hello,
>
> On Wed, 20 Aug 2014 11:03:41 -0600, mathieu.poirier@xxxxxxxxxx wrote:
>
>> diff --git a/drivers/coresight/Makefile b/drivers/coresight/Makefile
>> new file mode 100644
>> index 0000000..fef87bc
>> --- /dev/null
>> +++ b/drivers/coresight/Makefile
>> @@ -0,0 +1,9 @@
>> +#
>> +# Makefile for CoreSight drivers.
>> +#
>> +obj-$(CONFIG_CORESIGHT) += coresight.o
>> +obj-$(CONFIG_OF) += of_coresight.o
>> +obj-$(CONFIG_CORESIGHT_LINKS_AND_SINKS) += coresight-tmc.o coresight-tpiu.o \
>> +                                        coresight-etb10.o coresight-funnel.o \
>> +                                        coresight-replicator.o
>> +obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o
>
> I believe this is a bit messed up with PATCH 02/11. Here you're adding
> references to many files that aren't part of this patch, but are added
> in subsequent patches. PATCH 02/11 removes those lines and replaces
> them by the correct values. Surely an interactive rebase conflict that
> was not solved properly.

Yeah, that's messed up.  Thanks for pointing it out.

Mathieu

>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/