From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] reworked omap usb pdata changes for v3.9 merge window
Date: Tue, 19 Feb 2013 14:00:57 -0800 [thread overview]
Message-ID: <20130219220057.GK5724@atomide.com> (raw)
In-Reply-To: <201302192130.33509.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de> [130219 13:34]:
> On Friday 15 February 2013, Tony Lindgren wrote:
> > Hi Arnd & Olof,
> >
> > Roger Quadros reworked the OMAP USB patches that were causing
> > a conflict in Linux next and we requested to be dropped from
> > Linux next and reworked to remove the dependencies between
> > core SoC code and the driver code.
> >
> > Below is a pull request for the mach-omap2 specific parts, the
> > rest is driver specific and queued by Samuel in the MFD tree
> > and Greg for the USB changes.
> >
> > I've left it unresolved so you can merge it into one of your
> > branches as a dependency so we can avoid the merge conflict
> > in Linux next. A link to the merge resolution done by Stephen
> > is in the pull request. Let me know if you want me to resolve
> > it instead.
>
> I've pulled them into next/soc now. I was wondering whether to
> put them into the late/omap branch instead, but this seemed
> like the easiest way to resolve the conflict, and the patches
> are simple enough.
OK thanks!
Tony
prev parent reply other threads:[~2013-02-19 22:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-15 0:35 [GIT PULL] reworked omap usb pdata changes for v3.9 merge window Tony Lindgren
2013-02-19 21:30 ` Arnd Bergmann
2013-02-19 22:00 ` Tony Lindgren [this message]
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=20130219220057.GK5724@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).