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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 25 Aug 2014 07:53:15 -0600
From:	Mathieu Poirier <mathieu.poirier@...aro.org>
To:	Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Cc:	Linus Walleij <linus.walleij@...aro.org>,
	Will Deacon <will.deacon@....com>,
	Russell King - ARM Linux <linux@....linux.org.uk>,
	00regkh@...uxfoundation.org,
	Daniel Thompson <daniel.thompson@...aro.org>,
	Robert Marklund <robbelibobban@...il.com>,
	Al Grant <Al.Grant@....com>,
	Patch Tracking <patches@...aro.org>,
	Marcin Jabrzyk <marcin.jabrzyk@...il.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Panchaxari Prasannamurthy Tumkur 
	<panchaxari.prasannamurthy@...aro.org>,
	"r.sengupta@...sung.com" <r.sengupta@...sung.com>,
	Tony Armitstead <Tony.Armitstead@....com>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	James King <james.king@...aro.org>,
	Pratik Patel <pratikp@...eaurora.org>,
	Vikas Varshney <varshney@...com>,
	Jonas Svennebring <jonas.svennebring@...gotech.com>,
	Kaixu Xia <kaixu.xia@...aro.org>
Subject: Re: [PATCH 01/11 v4] coresight: add CoreSight core layer framework

On 25 August 2014 02:24, Thomas Petazzoni
<thomas.petazzoni@...e-electrons.com> wrote:
> Hello,
>
> On Wed, 20 Aug 2014 11:03:41 -0600, mathieu.poirier@...aro.org 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/