On Thu, Mar 01, 2012 at 08:51:53AM -0800, Greg KH wrote: > On Tue, Feb 28, 2012 at 03:24:04PM +0200, Felipe Balbi wrote: > > Hi, > > > > On Tue, Feb 28, 2012 at 03:22:02PM +0200, Felipe Balbi wrote: > > > Hi Greg, > > > > > > Here's the meat for this merge window. A bunch of fixes on UDC > > > controllers, a new generic API for mapping/unmapping usb_requests, > > > new descriptors and so on. > > > > > > All commits have been on linux-usb for quite a while. Please consider > > > pulling on your usb-next branch. > > > > > > The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: > > > > > > Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/gadget-for-v3.4 > > > > I forgot to mention there will be a small conflict between this tag and > > dwc3 tag, but the fix is very simple, you just need to delete one line > > by hand and the mergetool will do the rest. Let me know if you encounter > > any big issues when merging. > > The merge issue I get here is that it looks I should delete the > dwc3_map_buffer_to_dma() and dwc3_unmap_buffer_from_dma() calls, right? that's correct. > I don't think anything else uses these but I can't see why this got a > merge error, I'll dig harder. It's because the gadget branch lacks a fix which comes from dwc3 branch. > If this is incorrect, please let me know. go ahead, we now have generic map/unmap request APIs. -- balbi
Attachment:
signature.asc
Description: Digital signature
