[PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c

[Greg Kroah-Hartman]

On Fri, Feb 14, 2014 at 12:45:30PM -0500, Mark Hounschell wrote:
> On 02/14/2014 12:38 PM, Greg Kroah-Hartman wrote:
> > 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 at compro.net>
> >> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> >>
> >>  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(-)
> >>
> >> 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
> > 
> > Another good reason to use git is that I can't apply this patch to my
> > trees, as you made it against the 3.13.1 tree, yet it needs to be
> > applied to the 3.14-rc1 tree, which is a few thousand changes beyond
> > 3.13.  We have to work against the development trees, not the older
> > stable trees, as we can't go back in time :)
> > 
> > If you had used git here, it could have tried to handle the merging
> > properly, but as-is, it can't figure out what is going on:
> > 
> > $ git am --3way ../s2
> > Applying: staging: dgap: Merge dgap_fep5.c into dgap_driver.c
> > fatal: sha1 information is lacking or useless (drivers/staging/dgap/dgap_driver.c).
> > Repository lacks necessary blobs to fall back on 3-way merge.
> > Cannot fall back to three-way merge.
> > Patch failed at 0001 staging: dgap: Merge dgap_fep5.c into dgap_driver.c
> > The copy of the patch that failed is found in:
> >    /home/gregkh/linux/work/staging/.git/rebase-apply/patch
> > When you have resolved this problem, run "git am --continue".
> > If you prefer to skip this patch, run "git am --skip" instead.
> > To restore the original branch and stop patching, run "git am --abort".
> > 
> > So, can you redo this whole patch series against 3.14-rc2 so I can apply
> > them?
> > 
> > Sorry for the extra work, it will save time in the long run :)
> > 
> 
> No problem, I can redo them next week. I need the practice anyway. Maybe
> I'll try with git? Should I possibly use your git tree instead of 3.14-rc2?

Yes, please feel free to work off of the staging-next branch of my
staging.git tree, as that is where I will have to apply them.

If you have problems, please let me know.

thanks,

greg k-h