Message ID | 1405956929-10169-1-git-send-email-balbi@ti.com |
---|---|
State | New |
Headers | show |
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. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
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.