Minor nits for future patch submissions: On Wed, Feb 12, 2014 at 03:32:10PM -0500, Mark Hounschell wrote: > There is a lot of cleanup work to do on these digi drivers and merging as > much as is possible will make it easier. I also notice that many merged > drivers are single source and header. > > Merge dgap_fep5.c into dgap_driver.c > > Signed-off-by: Mark Hounschell <markh@xxxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > drivers/staging/dgap/Makefile | 2 > drivers/staging/dgap/dgap_driver.c | 1877 +++++++++++++++++++++++++- > drivers/staging/dgap/dgap_fep5.c | 1948 --------------------------- > 3 files changed, 1862 insertions(+), 1965 deletions(-) You need a "---" line above the diffstat, otherwise git adds it to the changelog. > diff -urN linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.c linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c > --- linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.c 2014-01-29 08:06:37.000000000 -0500 > +++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c 2014-01-31 10:22:53.675819451 -0500 You aren't using git, which is fine, but as you are dealing with patch series, I'd recommend using it, or quilt, or something else that handles managing your patches. Doing it "by hand" like this isn't going to scale, especially as you now need to work against the linux-next tree, or my staging-next branch of staging.git from git.kernel.org. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
