From: Arnd Bergmann <arnd@arndb.de>
To: Tony Lindgren <tony@atomide.com>
Cc: Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] reworked omap usb pdata changes for v3.9 merge window
Date: Tue, 19 Feb 2013 21:30:33 +0000 [thread overview]
Message-ID: <201302192130.33509.arnd@arndb.de> (raw)
In-Reply-To: <20130215003543.GF11806@atomide.com>
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.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
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 21:30:33 +0000 [thread overview]
Message-ID: <201302192130.33509.arnd@arndb.de> (raw)
In-Reply-To: <20130215003543.GF11806@atomide.com>
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.
Arnd
next prev parent reply other threads:[~2013-02-19 21:30 UTC|newest]
Thread overview: 6+ 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-15 0:35 ` Tony Lindgren
2013-02-19 21:30 ` Arnd Bergmann [this message]
2013-02-19 21:30 ` Arnd Bergmann
2013-02-19 22:00 ` Tony Lindgren
2013-02-19 22:00 ` 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=201302192130.33509.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.