linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Mack <zonque@gmail.com>
To: "Hiremath, Vaibhav" <hvaibhav@ti.com>
Cc: Ajay Gupta <ajayg@nvidia.com>, "B, Ravi" <ravibabu@ti.com>,
	"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
	"Balbi, Felipe" <balbi@ti.com>,
	"grant.likely@secretlab.ca" <grant.likely@secretlab.ca>,
	"devicetree-discuss@lists.ozlabs.org"
	<devicetree-discuss@lists.ozlabs.org>,
	"tony@atomide.com" <tony@atomide.com>,
	"ajayguptaj@gmail.com" <ajayguptaj@gmail.com>
Subject: Re: [PATCH v7 00/11] usb: musb: adding multi instance support
Date: Sun, 05 Aug 2012 21:52:53 +0200	[thread overview]
Message-ID: <501ECF15.2040409@gmail.com> (raw)
In-Reply-To: <79CD15C6BA57404B839C016229A409A83EA7FB18@DBDE01.ent.ti.com>

On 03.08.2012 17:48, Hiremath, Vaibhav wrote:
> On Fri, Aug 03, 2012 at 17:11:38, Daniel Mack wrote:
>> On 03.08.2012 11:07, Hiremath, Vaibhav wrote:
>>> I have just pushed the code (V7 which Ravi submitted), so can you please try 
>>> with below branch? 
>>>
>>> https://github.com/hvaibhav/am335x-linux/tree/am335x-upstream-staging-usb
>>
>> Thanks for doing this, but I'm unfortunately getting tons of merge
>> conflicts when I try to put this on top of 3.6-rc1. Still pondering
>> which way around is the easiest to get this solved.
>>
>> OTOH, I wonder whether your staging branches would need to rebased
>> sooner or later anyway?
>>
> 
> I have already pushed branch based on v3.6-rc1 (boot tested),
> 
> https://github.com/hvaibhav/am335x-linux/tree/am335x-linux-next-master

Sorry, I don't get it yet. Your am335x-linux-next-master can be merged
into v3.6-rc1 without problems, but it doesn't contain Ravi's patches.
And am335x-upstream-staging-usb doesn't apply on top of either
am335x-linux-next-master or v3.6-rc1.

Maybe I just miss a detail here. Could you again explain which branch
will you publish for merging in the 3.7 merge window, and what are its
dependencies?


Thanks for your work,
Daniel

  parent reply	other threads:[~2012-08-05 19:52 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-02 12:12 [PATCH v7 00/11] usb: musb: adding multi instance support Ravi Babu
2012-08-02 12:12 ` [PATCH v7 03/11] usb: musb: am335x: add support for dual instance Ravi Babu
2012-08-02 12:12 ` [PATCH v7 04/11] usb: otg: nop: add support for multiple tranceiver Ravi Babu
2012-08-02 12:12 ` [PATCH v7 07/11] usb: otg: nop: add dt support Ravi Babu
     [not found] ` <1343909574-15633-1-git-send-email-ravibabu-l0cyMroinI0@public.gmane.org>
2012-08-02 12:12   ` [PATCH v7 01/11] usb: musb: add musb_ida for multi instance support Ravi Babu
2012-08-02 12:12   ` [PATCH v7 02/11] usb: musb: kill global and static for multi instance Ravi Babu
2012-08-02 12:12   ` [PATCH v7 05/11] usb: musb: dsps: add dt support Ravi Babu
2012-08-02 12:12   ` [PATCH v7 06/11] arm/dts: am33xx: Add dt data for usbss Ravi Babu
2012-08-02 12:12   ` [PATCH v7 08/11] arm/dts: am33xx: add dt data for usb nop phy Ravi Babu
2012-08-02 12:12   ` [PATCH v7 09/11] usb: musb: dsps: remove explicit NOP device creation Ravi Babu
2012-08-02 12:12   ` [PATCH v7 10/11] usb: musb: dsps: get the PHY using phandle api Ravi Babu
2012-08-02 22:08   ` [PATCH v7 00/11] usb: musb: adding multi instance support Daniel Mack
     [not found]     ` <501AFA6B.4010005-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-08-03  0:54       ` B, Ravi
     [not found]         ` <6C6B28D4DC342643927BEAFCE8707BF63E9DB6AE-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2012-08-03  8:19           ` Daniel Mack
2012-08-03  8:43             ` Ajay Gupta
     [not found]               ` <F20D4CDD972CFA4D89D3A083D2D561967FF1F67DE3-kdsAE/FnitNDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2012-08-03  8:53                 ` B, Ravi
2012-08-03  9:02               ` Daniel Mack
     [not found]                 ` <501B93AB.7050501-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-08-03  9:07                   ` Hiremath, Vaibhav
     [not found]                     ` <79CD15C6BA57404B839C016229A409A83EA7F4A3-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2012-08-03 11:41                       ` Daniel Mack
2012-08-03 11:48                         ` B, Ravi
2012-08-03 12:35                         ` Koen Kooi
     [not found]                         ` <501BB8F2.8030909-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-08-03 15:48                           ` Hiremath, Vaibhav
2012-08-03 16:01                             ` Koen Kooi
2012-08-05 19:52                             ` Daniel Mack [this message]
2012-08-06  6:40                               ` Hiremath, Vaibhav
2012-08-15 14:39   ` Christopher Harvey
2012-08-02 12:12 ` [PATCH v7 11/11] arm/dts: am33xx: add phy phandle to usbss Ravi Babu

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=501ECF15.2040409@gmail.com \
    --to=zonque@gmail.com \
    --cc=ajayg@nvidia.com \
    --cc=ajayguptaj@gmail.com \
    --cc=balbi@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=hvaibhav@ti.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=ravibabu@ti.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;
as well as URLs for NNTP newsgroup(s).