From: Felipe Balbi <balbi@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@ti.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux USB Mailing List <linux-usb@vger.kernel.org>
Subject: Re: [GIT PULL] USB changes for v3.17
Date: Mon, 21 Jul 2014 16:06:50 -0500 [thread overview]
Message-ID: <20140721210650.GD23155@saruman.home> (raw)
In-Reply-To: <20140721183450.GA9849@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]
On Mon, Jul 21, 2014 at 11:34:50AM -0700, Greg KH wrote:
> On Mon, Jul 21, 2014 at 10:35:29AM -0500, Felipe Balbi wrote:
> > Hi Greg,
> >
> > Here's my big set of patches containing 97 commits. While it looks big and
> > all, most commits are just cleanups moving code around, using devm_*, etc.
> >
> > I tested these patches on a couple TI platforms and couldn't find any regressions
> > on my setup.
> >
> > This tree has also been on linux-next for a while.
> >
> > Please consider merging on top of your usb-next branch or let me know if you
> > want anything to change.
> >
> > cheers
> >
> > The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
> >
> > Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v3.17
>
> I've now merged and pushed this out. I did have some merge conflicts in
> these files:
> drivers/usb/musb/musb_core.c
> drivers/usb/musb/musb_cppi41.c
> include/uapi/linux/usb/functionfs.h
>
> and I _think_ I resolved them properly, but getting verification of this
> would be great.
your resolution looks correct to me, thank you.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2014-07-21 21:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 15:35 [GIT PULL] USB changes for v3.17 Felipe Balbi
2014-07-21 18:34 ` Greg KH
2014-07-21 21:06 ` Felipe Balbi [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=20140721210650.GD23155@saruman.home \
--to=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.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