From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 00/21] ARM: OMAP2+: Adapt to ehci-omap changes for 3.10
Date: Fri, 5 Apr 2013 08:43:00 -0700 [thread overview]
Message-ID: <20130405154259.GZ10155@atomide.com> (raw)
In-Reply-To: <515E9FB1.2040803@ti.com>
* Benoit Cousson <b-cousson@ti.com> [130405 03:00]:
> On 04/05/2013 10:30 AM, Benoit Cousson wrote:
>
> ...
>
> >> ARM: dts: OMAP4: Add HS USB Host IP nodes
> >> ARM: dts: OMAP3: Add HS USB Host IP nodes
> >> ARM: dts: omap3-beagle: Add USB Host support
> >
> > These 3 DTS patches are good to me, but I cannot applied them on top of
> > the already existing patches I queued for 3.10.
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git
> > for_3.10/dts
> >
> > Could you rebase these 3 ones only, and I will applied them.
>
> Mmm, in fact, I've just seen the pull request from Tony :-(
>
>
> Tony,
>
> Don't you want to remove these DTS patches from the pull-request?
Oops sorry :( Looks like I applied them mistakenly as I saved all
the patches into a mbox, then applied it. Anyways, too late to start
messing with it now.
> Otherwise, I will have to rebase the whole DTS series on top of yours.
> That being said, if the branch is not supposed to be rebased, it is doable.
I pulled in your for_3.10/dts for testing, and to me it looks like
it's just overlapping additions. So that should be OK to resolve while
pulling it in.
It seems there's no need to add omap-for-v3.10/usb as a dependency for
your for_3.10/dts unless the conflict gets non-trivial with some
additional patches.
Regards,
Tony
next prev parent reply other threads:[~2013-04-05 15:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 15:44 [PATCH v4 00/21] ARM: OMAP2+: Adapt to ehci-omap changes for 3.10 Roger Quadros
2013-03-20 15:44 ` [PATCH v4 01/21] usb: phy: nop: Add some parameters to platform data Roger Quadros
2013-03-20 15:55 ` Felipe Balbi
2013-03-20 16:13 ` Tony Lindgren
2013-03-20 16:19 ` Felipe Balbi
2013-04-02 17:21 ` Tony Lindgren
2013-04-03 14:53 ` Roger Quadros
2013-03-20 15:44 ` [PATCH v4 02/21] ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys() Roger Quadros
2013-03-20 15:44 ` [PATCH v4 03/21] ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes Roger Quadros
2013-03-20 15:44 ` [PATCH v4 04/21] ARM: OMAP3: Beagle: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 05/21] ARM: OMAP3: 3430SDP: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 06/21] ARM: OMAP3: 3630SDP: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 07/21] ARM: OMAP: AM3517crane: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 08/21] ARM: OMAP: AM3517evm: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 09/21] ARM: OMAP3: cm-t35: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 10/21] ARM: OMAP3: cm-t3517: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 11/21] ARM: OMAP: devkit8000: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 12/21] ARM: OMAP3: igep0020: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 13/21] ARM: OMAP3: omap3evm: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 14/21] ARM: OMAP3: omap3pandora: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 15/21] ARM: OMAP3: omap3stalker: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 16/21] ARM: OMAP3: omap3touchbook: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 17/21] ARM: OMAP3: overo: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 18/21] ARM: OMAP: zoom: " Roger Quadros
2013-03-20 15:44 ` [PATCH v4 19/21] ARM: dts: OMAP4: Add HS USB Host IP nodes Roger Quadros
2013-03-20 15:44 ` [PATCH v4 20/21] ARM: dts: OMAP3: " Roger Quadros
2013-03-20 15:45 ` [PATCH v4 21/21] ARM: dts: omap3-beagle: Add USB Host support Roger Quadros
2013-04-05 8:30 ` [PATCH v4 00/21] ARM: OMAP2+: Adapt to ehci-omap changes for 3.10 Benoit Cousson
2013-04-05 9:56 ` Benoit Cousson
2013-04-05 15:43 ` Tony Lindgren [this message]
2013-04-08 12:06 ` Benoit Cousson
2013-04-08 17:09 ` Tony Lindgren
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=20130405154259.GZ10155@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).