On Tue, Oct 18, 2011 at 05:07:34PM +0100, Mark Einon wrote: > Created one big .c file for the driver, moving the contents of all > driver .c files into it. > > Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx> Something is wrong here, when I try to apply this patch with git, I get the following errors: $ git am -s ../s2 Applying: staging: et131x: Put all .c files into one big file error: removal patch leaves file contents error: drivers/staging/et131x/et1310_eeprom.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et1310_mac.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et1310_phy.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et1310_pm.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et1310_rx.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et1310_tx.c: patch does not apply /home/gregkh/linux/work/staging/.git/rebase-apply/patch:70: new blank line at EOF. + error: removal patch leaves file contents error: drivers/staging/et131x/et131x_ethtool.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et131x_initpci.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et131x_isr.c: patch does not apply error: removal patch leaves file contents error: drivers/staging/et131x/et131x_netdev.c: patch does not apply Patch failed at 0001 staging: et131x: Put all .c files into one big file When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Your patch is in the mbox called '../s2' above. Care to resend it with the file actually deleted? How are you generating this patch? And, when you resend the series, don't put the [RESEND] in the subject, I had to edit that out in order to apply them properly (which turned out to be a waste of time due to this patch not applying...) thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
