From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russ Dill <Russ.Dill@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the mfd tree
Date: Tue, 3 Jul 2012 16:03:04 -0700 [thread overview]
Message-ID: <20120703230304.GA15624@kroah.com> (raw)
In-Reply-To: <20120703140938.b2ae0cf0ce2a3a470bb6cec6@canb.auug.org.au>
On Tue, Jul 03, 2012 at 02:09:38PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit 996439f8fa07 ("mfd: USB: Fix
> the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
> commit 984e97483a14 ("ARM: OMAP: USB: Fixup ehci_hcd_omap_probe error
> path") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2012-07-03 23:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-03 4:09 linux-next: manual merge of the usb tree with the mfd tree Stephen Rothwell
2012-07-03 23:03 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-10 5:51 Stephen Rothwell
2012-07-10 15:12 ` Alan Stern
2012-07-10 15:12 ` Alan Stern
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=20120703230304.GA15624@kroah.com \
--to=greg@kroah.com \
--cc=Russ.Dill@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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.