Hi, On Tue, Aug 13, 2013 at 03:29:45PM -0700, Greg KH wrote: > On Tue, Aug 13, 2013 at 03:01:23PM -0500, Felipe Balbi wrote: > > Hi, > > > > On Tue, Aug 13, 2013 at 02:48:42PM -0500, Felipe Balbi wrote: > > > On Tue, Aug 13, 2013 at 02:41:25PM -0500, Felipe Balbi wrote: > > > > Hi Greg, > > > > > > > > Here's my pull request for v3.12 merge window. I know there are a bunch > > > > of patches pending in the mailing list but I won't have time to fully > > > > review them before merging so I decided that it's best to delay a merge > > > > window than it is to cause a bunch of regressions. > > > > > > > > Oh yeah, the patches under arch/arm got Acked by Tony Lindgren. > > > > > > > > Let me know if you want any changes to the pull request. > > > > > > just now I saw the build failure Stephen reported. Please don't merge > > > this in yet, I'll put a patch on top to fix the build failure. > > > > now fixed, here's the pull updated pull request: > > > > The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095: > > > > Linux 3.11-rc3 (2013-07-28 20:53:33 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v3.12 > > > > for you to fetch changes up to 8b841cb217fac676498de3dfe8fabe38b39cba4e: > > > > usb: phy: am335x: include linux/err.h (2013-08-13 14:59:13 -0500) > > I've pulled this now. There were some merge conflicts that I had to > resolve by hand. Please check that I got it all correct, it builds for > me, but that doesn't always mean much... your resolution looks correct to me. thanks -- balbi
Attachment:
signature.asc
Description: Digital signature
