On Wed, Aug 14, 2013 at 5:04 PM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Aug 13, 2013 at 03:49:52PM -0400, Lidza Louina wrote: >> This patch removes the dgnc_proc.c file, all references to proc functions in dgnc_driver.c and from the Makefile's build. >> >> There were a lot of issues with the proc code so I removed it to make sure it builds. I'll work on the proc code and add it to the build once it fits the new proc API. >> >> Signed-off-by: Lidza Louina <lidza.louina@xxxxxxxxx> >> --- >> drivers/staging/dgnc/Makefile | 2 +- >> drivers/staging/dgnc/dgnc_driver.c | 6 +- >> drivers/staging/dgnc/dgnc_proc.c | 1551 ------------------------------------ >> 3 files changed, 4 insertions(+), 1555 deletions(-) >> delete mode 100644 drivers/staging/dgnc/dgnc_proc.c > > For some strange reason, this patch doesn't apply with patch, or with > git: > > $ p1 < ../s2 > checking file drivers/staging/dgnc/Makefile > checking file drivers/staging/dgnc/dgnc_driver.c > checking file drivers/staging/dgnc/dgnc_proc.c > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored > > $ git am -s ../s2 > Applying: staging: dgnc: removes proc code > error: patch failed: drivers/staging/dgnc/dgnc_proc.c:1 > error: drivers/staging/dgnc/dgnc_proc.c: patch does not apply > Patch failed at 0001 staging: dgnc: removes proc code > 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 --resolved". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > > How did you create this patch? Very strange... I had reset my directory, applied the patch that (I thought) I had sent out last week, added the code to make sure it builds into the kernel, committed that, then started fixing up the code. All the patches I sent out stemmed from it. > Anyway, I applied the first one, but can't apply this one, can you > please resend it after verifying that you can apply it to the tree > yourself? I just applied the exact patch from last week to my directory and got errors. =[ I'll resend this patch... > Oh and yeah, line-wrap those changelog comments please :) ...with the lines wrapped. =] _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
