From: Brian P. <br...@vm...> - 2009-02-27 01:37:15
|
David Miller wrote: > From: Brian Paul <br...@vm...> > Date: Thu, 26 Feb 2009 15:27:48 -0700 > >> Looks good to me, David, but git-am gave me a bunch of errors when I tried to apply the patch: >> >> Applying mesa: Resurrect SPARC asm code. >> error: patch failed: src/glx/x11/glxext.c:979 >> error: src/glx/x11/glxext.c: patch does not apply >> error: patch failed: src/mesa/glapi/gl_SPARC_asm.py:39 >> error: src/mesa/glapi/gl_SPARC_asm.py: patch does not apply >> error: patch failed: src/mesa/glapi/glapi.c:344 >> error: src/mesa/glapi/glapi.c: patch does not apply >> error: patch failed: src/mesa/glapi/glapi_getproc.c:259 >> error: src/mesa/glapi/glapi_getproc.c: patch does not apply >> error: patch failed: src/mesa/sparc/glapi_sparc.S:26 >> error: src/mesa/sparc/glapi_sparc.S: patch does not apply >> error: patch failed: src/mesa/sparc/sparc.c:140 >> error: src/mesa/sparc/sparc.c: patch does not apply >> Patch failed at 0001. > > It works here, against master. > > davem@sunset:~/src/GIT/XORG/mesa/mesa$ git am 0001-mesa-Resurrect-SPARC-asm-code.patch > Applying: mesa: Resurrect SPARC asm code. > davem@sunset:~/src/GIT/XORG/mesa/mesa$ > > Maybe the mailing list or your email client munged it? > > I put a copy up at: > > http://vger.kernel.org/~davem/mesa/ > > Let me know if it still fails to apply. Thanks, that worked. I use Thunderbird for email. Your patch appeared inline; not as an attachment. When I saved the message to a file, long lines were broken with a '=' symbol and that fouled up git-am. I've occasionally seen this before. Don't know the cause. -Brian |