Greg KH wrote: > On Mon, May 03, 2010 at 01:33:40PM -0300, Mauro Carvalho Chehab wrote: >> Hi Stephen, >> >> Randy reported a breakage while compiling drivers/staging/tm6000, due to >> this change: >> commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c >> Author: Greg Kroah-Hartman <gregkh@xxxxxxx> >> Date: Thu Apr 29 15:46:07 2010 -0700 >> >> USB: remove unused usb_buffer_alloc and usb_buffer_free macros >> >> Now that all callers are converted over, remove the compatibility >> functions and all is good. >> >> Cc: Daniel Mack <daniel@xxxxxxxx> >> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> >> >> A fix patch is as simple as: >> s/usb_buffer_alloc/usb_alloc_coherent/ >> s/usb_buffer_free/usb_free_coherent/ >> >> The problem is that, if I apply such patch on my tree, it will break compilation >> with upstream. > > Not anymore. Those functions are now in Linus's tree, so you can safely > make the change in your tree now, and all is good :) Ah, that makes life easier, thanks! -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html