On Wed, Aug 14, 2013 at 08:49:24PM -0400, Lidza Louina wrote: > This patch removes the dgnc_proc.c and dgnc_proc.h files and all > references to proc functions in dgnc_driver.c. This also removes proc.h > from the include headers in driver.c, mgmt.c and sysfs.c and proc.o > from the Makefile. > > Drivers now use sysfs instead of proc. > > Signed-off-by: Lidza Louina <lidza.lou...@gmail.com> > --- > drivers/staging/dgnc/Makefile | 2 +- > drivers/staging/dgnc/dgnc_driver.c | 10 - > drivers/staging/dgnc/dgnc_mgmt.c | 1 - > drivers/staging/dgnc/dgnc_proc.c | 1551 > ------------------------------------ > drivers/staging/dgnc/dgnc_proc.h | 147 ---- > drivers/staging/dgnc/dgnc_sysfs.c | 1 - > 6 files changed, 1 insertion(+), 1711 deletions(-) > delete mode 100644 drivers/staging/dgnc/dgnc_proc.c > delete mode 100644 drivers/staging/dgnc/dgnc_proc.h
I think we are working off of different trees here, this one still fails to apply: $ p1 < ../s1 checking file drivers/staging/dgnc/Makefile checking file drivers/staging/dgnc/dgnc_driver.c Hunk #2 FAILED at 312. Hunk #3 FAILED at 400. Hunk #4 FAILED at 741. 3 out of 4 hunks FAILED checking file drivers/staging/dgnc/dgnc_mgmt.c Hunk #1 FAILED at 48. 1 out of 1 hunk FAILED 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 checking file drivers/staging/dgnc/dgnc_proc.h Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored checking file drivers/staging/dgnc/dgnc_sysfs.c Hunk #1 succeeded at 43 with fuzz 2 (offset -1 lines). $ git am -s ../s1 Applying: staging: dgnc: removes proc code error: patch failed: drivers/staging/dgnc/dgnc_driver.c:313 error: drivers/staging/dgnc/dgnc_driver.c: patch does not apply error: patch failed: drivers/staging/dgnc/dgnc_mgmt.c:48 error: drivers/staging/dgnc/dgnc_mgmt.c: patch does not apply error: patch failed: drivers/staging/dgnc/dgnc_proc.c:1 error: drivers/staging/dgnc/dgnc_proc.c: patch does not apply error: patch failed: drivers/staging/dgnc/dgnc_proc.h:1 error: drivers/staging/dgnc/dgnc_proc.h: patch does not apply error: patch failed: drivers/staging/dgnc/dgnc_sysfs.c:44 error: drivers/staging/dgnc/dgnc_sysfs.c: patch does not apply Patch failed at 0001 staging: dgnc: removes proc code Can you take this patch and apply it to a clean version of my staging.git tree on the staging-next branch? Can you please rebase on this branch and try sending it out again? How are you generating this patch? thanks, greg k-h _______________________________________________ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
