From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932625AbaHYNxR (ORCPT ); Mon, 25 Aug 2014 09:53:17 -0400 Received: from mail-oi0-f50.google.com ([209.85.218.50]:40599 "EHLO mail-oi0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752755AbaHYNxQ (ORCPT ); Mon, 25 Aug 2014 09:53:16 -0400 MIME-Version: 1.0 In-Reply-To: <20140825102445.1ff19682@free-electrons.com> References: <1408554231-24321-1-git-send-email-mathieu.poirier@linaro.org> <1408554231-24321-2-git-send-email-mathieu.poirier@linaro.org> <20140825102445.1ff19682@free-electrons.com> Date: Mon, 25 Aug 2014 07:53:15 -0600 Message-ID: Subject: Re: [PATCH 01/11 v4] coresight: add CoreSight core layer framework From: Mathieu Poirier To: Thomas Petazzoni Cc: Linus Walleij , Will Deacon , Russell King - ARM Linux , 00regkh@linuxfoundation.org, Daniel Thompson , Robert Marklund , Al Grant , Patch Tracking , Marcin Jabrzyk , "linux-kernel@vger.kernel.org" , Panchaxari Prasannamurthy Tumkur , "r.sengupta@samsung.com" , Tony Armitstead , "linux-arm-kernel@lists.infradead.org" , James King , Pratik Patel , Vikas Varshney , Jonas Svennebring , Kaixu Xia Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25 August 2014 02:24, Thomas Petazzoni wrote: > Hello, > > On Wed, 20 Aug 2014 11:03:41 -0600, mathieu.poirier@linaro.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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: mathieu.poirier@linaro.org (Mathieu Poirier) Date: Mon, 25 Aug 2014 07:53:15 -0600 Subject: [PATCH 01/11 v4] coresight: add CoreSight core layer framework In-Reply-To: <20140825102445.1ff19682@free-electrons.com> References: <1408554231-24321-1-git-send-email-mathieu.poirier@linaro.org> <1408554231-24321-2-git-send-email-mathieu.poirier@linaro.org> <20140825102445.1ff19682@free-electrons.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 25 August 2014 02:24, Thomas Petazzoni wrote: > Hello, > > On Wed, 20 Aug 2014 11:03:41 -0600, mathieu.poirier at linaro.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