linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benoit Cousson <b-cousson@ti.com>
To: Kishon Vijay Abraham I <kishon@ti.com>, <tony@atomide.com>
Cc: <grant.likely@secretlab.ca>, <rob.herring@calxeda.com>,
	<rob@landley.net>, <linux@arm.linux.org.uk>, <arnd@arndb.de>,
	<balbi@ti.com>, <devicetree-discuss@lists.ozlabs.org>,
	<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 0/2] ARM: dts: Add subnode for ocp2scp
Date: Thu, 20 Sep 2012 05:26:35 +0200	[thread overview]
Message-ID: <505A8CEB.6010100@ti.com> (raw)
In-Reply-To: <1348050772-27819-1-git-send-email-kishon@ti.com>

Hi Tony,

On 09/19/2012 12:32 PM, Kishon Vijay Abraham I wrote:
> This patch series contains a patch to explicitly add reg property
> to the ocp2scp dt node and a patch to add the subnode for ocp2scp
> (omap-usb2).
> 
> Since the original patch series that adds ocp2scp driver and ocp2scp
> data are merged in arm-soc, I'm sending this patch series based on the
> same tree.
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
> 
> But Benoit already pointed out that there's going to be merge conflicts
> as he has sent a bunch of dt data patches to linux-omap (devel-dt) tree.
> So now I'm not sure how that can be actually avoided.

What would you suggest?

I merged arm-soc/drivers/ocp2scp into my dts branch to get a proper base
for that series, but as expected, it conflicts :-(

So I fixed that and pulled this series on top of it.

It is something acceptable for a pull request? We already did that in
the past, but at that time it was not conflicting.

Thanks,
Benoit


      parent reply	other threads:[~2012-09-20  3:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-19 10:32 [PATCH 0/2] ARM: dts: Add subnode for ocp2scp Kishon Vijay Abraham I
2012-09-19 10:32 ` [PATCH 1/2] ARM: dts: omap: add *reg* property " Kishon Vijay Abraham I
2012-09-19 10:32 ` [PATCH 2/2] ARM: dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
2013-01-10  9:31   ` kishon
2013-01-10 10:04     ` Benoit Cousson
2013-01-10 10:16       ` kishon
2013-01-10 12:45         ` Felipe Balbi
2013-01-10 18:35           ` Tony Lindgren
2012-09-20  3:26 ` Benoit Cousson [this message]

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=505A8CEB.6010100@ti.com \
    --to=b-cousson@ti.com \
    --cc=arnd@arndb.de \
    --cc=balbi@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=kishon@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=rob.herring@calxeda.com \
    --cc=rob@landley.net \
    --cc=tony@atomide.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).