All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: mathieu.poirier@linaro.org
Cc: linus.walleij@linaro.org, will.deacon@arm.com,
	linux@arm.linux.org.uk, 00regkh@linuxfoundation.org,
	daniel.thompson@linaro.org, robbelibobban@gmail.com,
	Al.Grant@arm.com, patches@linaro.org, marcin.jabrzyk@gmail.com,
	linux-kernel@vger.kernel.org,
	panchaxari.prasannamurthy@linaro.org, r.sengupta@samsung.com,
	Tony.Armitstead@arm.com, linux-arm-kernel@lists.infradead.org,
	james.king@linaro.org, pratikp@codeaurora.org, varshney@ti.com,
	jonas.svennebring@avagotech.com, kaixu.xia@linaro.org
Subject: Re: [PATCH 01/11 v4] coresight: add CoreSight core layer framework
Date: Mon, 25 Aug 2014 10:24:45 +0200	[thread overview]
Message-ID: <20140825102445.1ff19682@free-electrons.com> (raw)
In-Reply-To: <1408554231-24321-2-git-send-email-mathieu.poirier@linaro.org>

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.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

WARNING: multiple messages have this Message-ID (diff)
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11 v4] coresight: add CoreSight core layer framework
Date: Mon, 25 Aug 2014 10:24:45 +0200	[thread overview]
Message-ID: <20140825102445.1ff19682@free-electrons.com> (raw)
In-Reply-To: <1408554231-24321-2-git-send-email-mathieu.poirier@linaro.org>

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.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

  reply	other threads:[~2014-08-25  8:25 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-20 17:03 [PATCH 00/11 v4] Coresight framework and drivers mathieu.poirier
2014-08-20 17:03 ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 01/11 v4] coresight: add CoreSight core layer framework mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-25  8:24   ` Thomas Petazzoni [this message]
2014-08-25  8:24     ` Thomas Petazzoni
2014-08-25 13:53     ` Mathieu Poirier
2014-08-25 13:53       ` Mathieu Poirier
2014-08-20 17:03 ` [PATCH 02/11 v4] coresight-tmc: add CoreSight TMC driver mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 03/11 v4] coresight-tpiu: add CoreSight TPIU driver mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 04/11 v4] coresight-etb: add CoreSight ETB driver mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 05/11 v4] coresight-funnel: add CoreSight Funnel driver mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 06/11 v4] coresight-replicator: add CoreSight Replicator driver mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 07/11 v4] coresight-etm: add CoreSight ETM/PTM driver mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 08/11 v4] coresight: adding documentation for coresight mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 09/11 v4] coresight: adding support for beagle and beagleXM mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-24 21:38   ` Marcin Jabrzyk
2014-08-24 21:38     ` Marcin Jabrzyk
2014-08-25 14:02     ` Mathieu Poirier
2014-08-25 14:02       ` Mathieu Poirier
2014-08-25 21:01       ` Marcin Jabrzyk
2014-08-25 21:01         ` Marcin Jabrzyk
2014-08-20 17:03 ` [PATCH 10/11 v4] coresight: adding basic support for Vexpress TC2 mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org
2014-08-20 17:03 ` [PATCH 11/11 v4] ARM: removing support for etb/etm in "arch/arm/kernel/" mathieu.poirier
2014-08-20 17:03   ` mathieu.poirier at linaro.org

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140825102445.1ff19682@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=00regkh@linuxfoundation.org \
    --cc=Al.Grant@arm.com \
    --cc=Tony.Armitstead@arm.com \
    --cc=daniel.thompson@linaro.org \
    --cc=james.king@linaro.org \
    --cc=jonas.svennebring@avagotech.com \
    --cc=kaixu.xia@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=marcin.jabrzyk@gmail.com \
    --cc=mathieu.poirier@linaro.org \
    --cc=panchaxari.prasannamurthy@linaro.org \
    --cc=patches@linaro.org \
    --cc=pratikp@codeaurora.org \
    --cc=r.sengupta@samsung.com \
    --cc=robbelibobban@gmail.com \
    --cc=varshney@ti.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.