[uml-devel] 2.6.16-rc2 x86_64; Jeff's uml patch tar doesn't apply

[William Stearns <wstearns@pobox.com>]

Good evening, all,
 	The uml patch tar file at 
http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.16-rc2/patches.tar 
should apply to 2.6.16-rc2, but when I try to apply it I get:


==== Applying /usr/src/2.6.16-rc2-patches-20060208/uml-add-tls-support
patching file arch/um/include/os.h
patching file arch/um/kernel/exec_kern.c
patching file arch/um/kernel/process_kern.c
patching file arch/um/kernel/ptrace.c
patching file arch/um/kernel/skas/process_kern.c
patching file arch/um/os-Linux/Makefile
Hunk #2 FAILED at 12.
1 out of 2 hunks FAILED -- saving rejects to file 
arch/um/os-Linux/Makefile.rej
patching file arch/um/os-Linux/tls.c
patching file arch/um/sys-i386/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file 
arch/um/sys-i386/Makefile.rej
patching file arch/um/sys-i386/syscalls.c
patching file arch/um/sys-i386/tls.c
patching file arch/um/sys-x86_64/Makefile
Hunk #1 FAILED at 7.
1 out of 1 hunk FAILED -- saving rejects to file 
arch/um/sys-x86_64/Makefile.rej
patching file arch/um/sys-x86_64/tls.c
patching file include/asm-um/desc.h
patching file include/asm-um/processor-i386.h
patching file include/asm-um/processor-x86_64.h
patching file include/asm-um/ptrace-generic.h
patching file include/asm-um/ptrace-i386.h
patching file include/asm-um/ptrace-x86_64.h
patching file include/asm-um/segment.h
Something went wrong with 
/usr/src/2.6.16-rc2-patches-20060208/uml-add-tls-support . Press enter 
when ready to move on.
==== Applying /usr/src/2.6.16-rc2-patches-20060208/fix-struct-compile
can't find file to patch at input line 6
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|# Change a couple of instances of struct modify_ldt_ldt_s to struct 
user_desc.
|Index: linux-2.6.15/arch/um/os-Linux/tls.c
|===================================================================
|--- linux-2.6.15.orig/arch/um/os-Linux/tls.c   2006-02-06 
16:47:11.000000000 -0500
|+++ linux-2.6.15/arch/um/os-Linux/tls.c        2006-02-06 
16:48:21.000000000 -0500
--------------------------
File to patch:


 	Cheers,
 	- Bill

---------------------------------------------------------------------------
 	..all in all it's just another rule in the firewall.
 	/Ping Flood/
(Courtesy of Hirling Endre)
--------------------------------------------------------------------------
William Stearns (wstearns@pobox.com).  Mason, Buildkernel, freedups, p0f,
rsync-backup, ssh-keyinstall, dns-check, more at:   http://www.stearns.org
--------------------------------------------------------------------------


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel