On Tue, 8 Feb 2005, Jeff Dike wrote: > D: 21605 > > [EMAIL PROTECTED] said: > > Finally got around to trying this, and i'm having problems. i pulled > > 2.6.11-rc3 and patched it to -mm3 w/o issue. > > -mm1?
doh! > > > Now the skas0 patch that > > is supposedly for 2.6.11-rc3-mm3 has rejects: > > Are you applying it just by itself? If so, that patchset is incremental. > Each patch applies cleanly on top of the ones that precede it. If you pull > one out by itself and try to apply it, you have to resolve the conflicts > yourself. i was just doing skas0, but now i'm doing them all in order, which was going ok until: patch -Np1 -i ../patches/mem-move && rm ../patches/mem-move patching file arch/um/kernel/init_task.c patching file arch/um/kernel/mem_user.c Hunk #1 FAILED at 48. 1 out of 1 hunk FAILED -- saving rejects to file arch/um/kernel/mem_user.c.rej patching file arch/um/kernel/tempfile.c patching file arch/um/kernel/tlb.c patching file arch/um/os-Linux/Makefile patching file arch/um/os-Linux/mem.c patching file arch/um/os-Linux/start_up.c patching file arch/um/os-Linux/tt.c any ideas? -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Lonni J Friedman [EMAIL PROTECTED] LlamaLand http://netllama.linux-sxs.org ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ User-mode-linux-user mailing list User-mode-linux-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user
