On Wed, Aug 24, 2011 at 08:23:08PM +0200, Marc Dietrich wrote: > This patch fixes coding style and adds copyright notices. > > Signed-off-by: Marc Dietrich <marvin24@xxxxxx> > --- > drivers/staging/nvec/TODO | 5 +- > drivers/staging/nvec/nvec-keytable.h | 225 +++++++++++++--------- > drivers/staging/nvec/nvec.c | 20 ++- > drivers/staging/nvec/nvec.h | 38 +++- > drivers/staging/nvec/nvec_kbd.c | 56 ++++-- > drivers/staging/nvec/nvec_power.c | 350 +++++++++++++++++----------------- > drivers/staging/nvec/nvec_ps2.c | 88 +++++---- > 7 files changed, 446 insertions(+), 336 deletions(-) This patch fails to apply to my tree: patching file drivers/staging/nvec/TODO patching file drivers/staging/nvec/nvec-keytable.h patching file drivers/staging/nvec/nvec.c patching file drivers/staging/nvec/nvec.h patching file drivers/staging/nvec/nvec_kbd.c Hunk #1 FAILED at 1. Hunk #3 FAILED at 28. Hunk #4 FAILED at 47. Hunk #5 FAILED at 75. Hunk #6 FAILED at 91. 5 out of 8 hunks FAILED -- saving rejects to file drivers/staging/nvec/nvec_kbd.c.rej patching file drivers/staging/nvec/nvec_power.c patching file drivers/staging/nvec/nvec_ps2.c What did I do wrong? Care to redo this against the staging-next branch? If I've applied other patches, perhaps that's the problem? I applied patch 1/8 as that worked. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
