> On Tue, Feb 26, 2008 at 02:12:53PM -0800, Anthony Brock wrote: >> # bzip2 -dc ../2.6.25-rc2-mm1.bz2 | patch >> The next patch would create the file o2cb, >> which already exists! Assume -R? [n] > > That looks right - I'd double-check that the tree is what you think it > is. I'm in the habit of head Makefile to check the version whenever I > think I've changed it. I forget to take the --dry-run off patch often > enough...
Okay, I found my error. I should have used '-p1' as a flag for my patch command. The -mm patches applied cleanly. I now see the following in my Makefile: # head -6 Makefile VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 EXTRAVERSION = -rc2-mm1 NAME = Funky Weasel is Jiggy wit it # However, I'm still seeing the following: # patch -p1 < ../random-test.patch patching file arch/um/drivers/random.c Hunk #1 succeeded at 8 with fuzz 2. Hunk #3 succeeded at 41 with fuzz 1. Hunk #4 succeeded at 65 with fuzz 1. Hunk #5 succeeded at 106 with fuzz 1. Hunk #6 FAILED at 127. Hunk #8 FAILED at 155. 2 out of 8 hunks FAILED -- saving rejects to file arch/um/drivers/random.c.rej patching file arch/um/os-Linux/sigio.c Hunk #1 FAILED at 338. Hunk #2 succeeded at 360 with fuzz 1. 1 out of 2 hunks FAILED -- saving rejects to file arch/um/os-Linux/sigio.c.rej patching file include/asm-um/irq.h Hunk #1 FAILED at 15. 1 out of 1 hunk FAILED -- saving rejects to file include/asm-um/irq.h.rej # So, I'm going to try and manually fit the rejected portions into the code. Tony ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ User-mode-linux-user mailing list User-mode-linux-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-user
