Messages in this thread | | | Date | Fri, 30 Apr 2010 07:44:20 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the input tree |
| |
On Fri, Apr 30, 2010 at 03:51:15PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/input/tablet/kbtab.c between commits > ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418 ("Input: kbtab - fix incorrect > size parameter in usb_buffer_free") and > 331cb022d3ac1f85f7842a51495c33c629e947bc ("Input: kbtab - simplify > kbtab_disconnect()") from the input tree and commit > 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc() > and usb_buffer_free() users") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary.
thanks for the fix.
greg k-h
| |