Problems applying patches to 2.6.12-rc5-mm1

I'm running into a problem applying the latest tarball from Jeff's tree. I've downloaded the linux-2.6.12-rc5 source and applied the -mm1 patches with:

# bzip2 -dc ../2.6.12-rc5-mm1.bz2 |patch -p1

This applied without issue. I then tried to apply the tarball from Jeff's patches:

# quilt push -a
Applying patch set-tsk-need-resched
patching file arch/um/kernel/process_kern.c

< output trimmed >

Applying patch os-main
patching file arch/um/kernel/Makefile
patching file arch/um/kernel/main.c
Hunk #1 FAILED at 1.
File arch/um/kernel/main.c is not empty after patch, as expected 1 out of 1 hunk FAILED -- rejects in file arch/um/kernel/main.c patching file arch/um/kernel/um_arch.c
patching file arch/um/os-Linux/Makefile
patching file arch/um/os-Linux/main.c
Patch os-main does not apply (enforce with -f)
#

Any ideas?

Tony

-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Grab the patches again. I may have synced the patches when I didn't have them all pushed. I just synced again, and everything is applied, so these should work.

Then get a stack trace from that. I promise not to change too much in the next day or two, so your line numbers should still match mine.

Jeff

-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel