From: Benoit Cousson <b-cousson@ti.com>
To: "ABRAHAM, KISHON VIJAY" <kishon@ti.com>, <tony@atomide.com>
Cc: <balbi@ti.com>, <linux@arm.linux.org.uk>,
<rob.herring@calxeda.com>, <grant.likely@secretlab.ca>,
<rnayak@ti.com>, <hvaibhav@ti.com>, <peter.ujfalusi@ti.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB
Date: Tue, 11 Sep 2012 11:11:47 +0200 [thread overview]
Message-ID: <504F0053.6000808@ti.com> (raw)
In-Reply-To: <CAAe_U6JoW36bWSamHkRV66JX5fZ3QkLQv=4XJr-MuaFgaRjOaA@mail.gmail.com>
On 09/11/2012 10:44 AM, ABRAHAM, KISHON VIJAY wrote:
> Hi Benoit,
>
> On Tue, Sep 11, 2012 at 1:55 PM, Benoit Cousson <b-cousson@ti.com> wrote:
>> On 09/11/2012 08:36 AM, Kishon Vijay Abraham I wrote:
>>> No major change from the previous version. Just removed the
>>> omap-usb2 dt data and sent that as a separate patch.
>>
>> Well, I think you'd better keep them in the same series :-)
>>
>>> Rebased on
>>> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git musb
>>
>> Since it is DTS stuf, you should rebase that on top of the latest
>> lo/devel-dt branch. All the latest DTS patches an in there for 3.7.
>
> The ocp2scp data is not in linux-omap :-( And omap-usb2 has to be a
> child of ocp2scp. So I used arm-soc tree to which ocp2scp stuff was
> pulled into.
Mmm, but from what tree? It did not go through Tony?
What arm-soc branch exactly?
In that case we need to merge Tony's devel-dt into arm-soc to have a
common base or ask Tony to rebase on top of arm-soc.
I added a bunch of change inside OMAP4.dtsi, so we can expect some nice
conflicts.
That's why it is better to push DTS patches using a single channel.
Tony,
What will make more sense to avoid merge conflict later?
Regards,
Benoit
next prev parent reply other threads:[~2012-09-11 9:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 6:36 [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB Kishon Vijay Abraham I
2012-09-11 6:36 ` [PATCH v2 1/3] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
2012-09-11 9:26 ` Benoit Cousson
2012-09-11 9:39 ` ABRAHAM, KISHON VIJAY
2012-09-11 10:05 ` Benoit Cousson
2012-09-11 6:36 ` [PATCH v2 2/3] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
2012-09-11 10:09 ` Benoit Cousson
2012-09-11 11:07 ` ABRAHAM, KISHON VIJAY
2012-09-11 6:36 ` [PATCH v2 3/3] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
2012-09-11 10:18 ` Benoit Cousson
2012-09-11 8:25 ` [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB Benoit Cousson
2012-09-11 8:44 ` ABRAHAM, KISHON VIJAY
2012-09-11 9:11 ` Benoit Cousson [this message]
2012-09-11 9:16 ` ABRAHAM, KISHON VIJAY
2012-09-11 10:01 ` Benoit Cousson
2012-09-11 10:19 ` Benoit Cousson
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=504F0053.6000808@ti.com \
--to=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=grant.likely@secretlab.ca \
--cc=hvaibhav@ti.com \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=peter.ujfalusi@ti.com \
--cc=rnayak@ti.com \
--cc=rob.herring@calxeda.com \
--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