linux-kernel - Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

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]

Message-ID: <504F0053.6000808@ti.com>
Date:	Tue, 11 Sep 2012 11:11:47 +0200
From:	Benoit Cousson <b-cousson@...com>
To:	"ABRAHAM, KISHON VIJAY" <kishon@...com>, <tony@...mide.com>
CC:	<balbi@...com>, <linux@....linux.org.uk>,
	<rob.herring@...xeda.com>, <grant.likely@...retlab.ca>,
	<rnayak@...com>, <hvaibhav@...com>, <peter.ujfalusi@...com>,
	<linux-arm-kernel@...ts.infradead.org>,
	<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 0/3] arm/dts: omap: add dt data for MUSB

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@...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


--
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/