[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130205181947.GI25185@atomide.com>
Date: Tue, 5 Feb 2013 10:19:47 -0800
From: Tony Lindgren <tony@...mide.com>
To: "gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>,
"Cousson, Benoit" <b-cousson@...com>
Cc: kishon <kishon@...com>, Felipe Balbi <balbi@...com>,
"linux-usb@...r.kernel.org" <linux-usb@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
"devicetree-discuss@...ts.ozlabs.org"
<devicetree-discuss@...ts.ozlabs.org>,
"linux@....linux.org.uk" <linux@....linux.org.uk>
Subject: Re: [GIT PULL] ARM part of USB patches
* gregkh@...uxfoundation.org <gregkh@...uxfoundation.org> [130205 09:28]:
> On Tue, Feb 05, 2013 at 08:56:13PM +0530, kishon wrote:
> > Hi Tony, Greg,
> >
> > On Tuesday 05 February 2013 08:54 PM, kishon wrote:
> > >Hi Tony,
> > >
> > >As discussed, I'm sending a pull request for the arch/arm part of my USB
> > >patches. These patches are necessary to get MUSB functional in both dt
> > >and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch
> > >series *depends* on some of the patches which are merged in usb-next.
> >
> > This patch series should go in only after USB. Or else it will break
> > compilation.
>
> Then it probably should go through the USB tree, right? We don't want
> to break bisectability.
Looks like this branch needs to be based on at least 01658f0f (usb: phy:
add a new driver for usb part of control module) to compile. Probably
needs other USB patches too to make sense.
This branch has a high likelihood of conflicting with .dts files, so
Kishon, I suggest you do two branches:
1. A branch for Greg based on top of the USB changes
This branch should contain:
ARM: OMAP4: remove control module address space from PHY and OTG
ARM: OMAP: devices: create device for usb part of control module
ARM: OMAP2: MUSB: Specify omap4 has mailbox
ARM: OMAP: USB: Add phy binding information
Naturally please make sure they compile and boot on their own.
Looks like this will only cause few trivial include merge conflicts
with what I have queued up.
You can add my Acked-by: Tony Lindgren <tony@...mide.com> for those.
2. A branch for Benoit based on v3.8-rc6
That branch should contain all the .dts changes as those will
most likely cause nasty merge conflicts otherwise with what
Benoit has queued up.
Regards,
Tony
--
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/
Powered by blists - more mailing lists