Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On 02/17/2014 05:50 PM, Greg Kroah-Hartman wrote: On Mon, Feb 17, 2014 at 02:32:28PM -0500, Mark Hounschell wrote: On 02/14/2014 01:18 PM, Greg Kroah-Hartman wrote: 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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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.0 -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. Well, I think I figured out how to do all this with git using your tree but unfortunately I can't boot the staging-next kernel. It Oops right away but since this box has only digi serial ports, I can't report why. That's not good. I've merged the staging-next up to 3.14-rc3, which shouldn't crash for you. If it does, can you test 3.14-rc3 on its own, without the staging-next branch stuff? That's odd. I just installed vanilla 3.14-rc3 yesterday from kernel.org. It boots up fine but does not appear to have the same dgap driver as staging-next. Clearly staging-next is more up to date. I assume that means I just have the wrong 3.14-rc3? No matter, I can work with vanilla 3.14-rc3 with dgap from staging-next copied over into it? I can also git from where ever you did your merge. Sorry for my inexperience, but I don't know where that would be from though? linux-next? Thanks Mark ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On Tue, Feb 18, 2014 at 08:00:57AM -0500, Mark Hounschell wrote: That's odd. I just installed vanilla 3.14-rc3 yesterday from kernel.org. It boots up fine but does not appear to have the same dgap driver as staging-next. Clearly staging-next is more up to date. I assume that means I just have the wrong 3.14-rc3? No matter, I can work with vanilla 3.14-rc3 with dgap from staging-next copied over into it? I can also git from where ever you did your merge. Sorry for my inexperience, but I don't know where that would be from though? linux-next? Here is the command to find which changes have been applied since v3.14-rc3: git log -p v3.14-rc3.. drivers/staging/dgap/ There have been no noteworthy changes. Just spelling fixes and removing dead code. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On 02/18/2014 08:14 AM, Dan Carpenter wrote: On Tue, Feb 18, 2014 at 08:00:57AM -0500, Mark Hounschell wrote: That's odd. I just installed vanilla 3.14-rc3 yesterday from kernel.org. It boots up fine but does not appear to have the same dgap driver as staging-next. Clearly staging-next is more up to date. I assume that means I just have the wrong 3.14-rc3? No matter, I can work with vanilla 3.14-rc3 with dgap from staging-next copied over into it? I can also git from where ever you did your merge. Sorry for my inexperience, but I don't know where that would be from though? linux-next? Here is the command to find which changes have been applied since v3.14-rc3: git log -p v3.14-rc3.. drivers/staging/dgap/ There have been no noteworthy changes. Just spelling fixes and removing dead code. Sorry again for my ignorance. If I re git clone staging-next will I get something that is based on 3.14-rc3 (so I can boot)? Or do I have to re git clone from somewhere else? I'm still in pretty big git learning curve? Thanks Mark ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On Tue, Feb 18, 2014 at 08:27:17AM -0500, Mark Hounschell wrote: On 02/18/2014 08:14 AM, Dan Carpenter wrote: On Tue, Feb 18, 2014 at 08:00:57AM -0500, Mark Hounschell wrote: That's odd. I just installed vanilla 3.14-rc3 yesterday from kernel.org. It boots up fine but does not appear to have the same dgap driver as staging-next. Clearly staging-next is more up to date. I assume that means I just have the wrong 3.14-rc3? No matter, I can work with vanilla 3.14-rc3 with dgap from staging-next copied over into it? I can also git from where ever you did your merge. Sorry for my inexperience, but I don't know where that would be from though? linux-next? Here is the command to find which changes have been applied since v3.14-rc3: git log -p v3.14-rc3.. drivers/staging/dgap/ There have been no noteworthy changes. Just spelling fixes and removing dead code. Sorry again for my ignorance. If I re git clone staging-next will I get something that is based on 3.14-rc3 (so I can boot)? Or do I have to re git clone from somewhere else? I'm still in pretty big git learning curve? Your question is confusing. What does based on mean? The driver in staging-next is very similar to the driver in v3.14-rc3 but with some additional patches applied. Once you have one git tree then you don't need to clone again. You just to a git fetch and a git checkout. The git fetch command will download a smaller chunk of data than cloning the whole repository every time. Anyway, if you want v3.14-rc3 then just do: git fetch --tags git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git git checkout v3.14-rc3 Don't forget to add the v in v3.14-rc3. Type git tag -l to see which tags you can checkout. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On 02/14/2014 01:18 PM, Greg Kroah-Hartman wrote: 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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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.0 -0500 +++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c2014-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. Well, I think I figured out how to do all this with git using your tree but unfortunately I can't boot the staging-next kernel. It Oops right away but since this box has only digi serial ports, I can't report why. Regards Mark ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On Mon, Feb 17, 2014 at 02:32:28PM -0500, Mark Hounschell wrote: On 02/14/2014 01:18 PM, Greg Kroah-Hartman wrote: 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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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.0 -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. Well, I think I figured out how to do all this with git using your tree but unfortunately I can't boot the staging-next kernel. It Oops right away but since this box has only digi serial ports, I can't report why. That's not good. I've merged the staging-next up to 3.14-rc3, which shouldn't crash for you. If it does, can you test 3.14-rc3 on its own, without the staging-next branch stuff? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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(-) 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.0 -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 de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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.0 -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 :) thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
On 02/14/2014 12:34 PM, Greg Kroah-Hartman wrote: 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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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(-) You need a --- line above the diffstat, otherwise git adds it to the changelog. Yes, I have since found out this. 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.0 -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. Yes, I have also found this out and will learn to do using git. May take some time, but will learn it. Thanks mark ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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.0 -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? Thanks again Mark ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c
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 ma...@compro.net Cc: Greg Kroah-Hartman gre...@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.0 -0500 +++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c2014-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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
