On Wed, Aug 28, 2013 at 12:57 AM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Aug 27, 2013 at 10:13:28PM -0400, Lidza Louina wrote: >> This patch removes the dgnc_driver_kzmalloc function from >> driver.c and driver.h. A previous patch replaced all >> dgnc_driver_kzmalloc function calls with kzalloc. >> >> Signed-off-by: Lidza Louina <lidza.louina@xxxxxxxxx> >> --- >> drivers/staging/dgnc/dgnc_driver.c | 15 --------------- >> drivers/staging/dgnc/dgnc_driver.h | 1 - >> 2 files changed, 16 deletions(-) > > This patch had to be edited by hand, due to some fuzz in it when > applying to my tree. That means I think we are out of sync again with > what you have sent, and what I have applied. > > Can you resync on my tree again and resend anything I haven't applied, > and then work from there, to make sure I didn't accidentally drop > something you thought I applied? Absolutely. _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel