Re: [Netnice-kernels] Linux Kernel
Status: Alpha
Brought to you by:
taost6
From: Scott B. <sco...@ve...> - 2004-10-07 21:54:49
|
On Thu, 7 Oct 2004, Takashi Okumura wrote: > hi kartikey! > > thanks for the patch. how're you feeling now?? > > i don't know why the code on the CVS isn't the latest one, > but, that is okay. > > i also tried the patch, and got the same error as Scott did. > > > patch: **** malformed patch at line 14: }; > > what option do i need to give to the patch command?? > i'm using patch 2.5.4, and i've tried -p0, -p1, -p2, -p3 > options in the target directory, but, they didn't work. > > any thoughts? > > thanks! > > -- taka > Hi, I am pretty sure that the patch file attachment was corrupted by an email program. The error message about the malformed patch on line 14 occurs because there is a space character missing from the start of the line. I reformatted the first hunk, adding the spaces where they were needed and it applied ok. Notice also that the hunk headers have line breaks added to them. Here is a cut and paste of the area of the patch file that causes the error message and a reformatted version that applies. The original patch looks like so, notice hat the '}' character is directly under the '+' above it. so it looks like this: + +#ifdef CONFIG_NETNICE + caddr_t so_vifnet; +#endif }; struct vm_area_struct; This should look like the following in the unified diff format. Notice that there is a blank space before the '}': + +#ifdef CONFIG_NETNICE + caddr_t so_vifnet; +#endif }; struct vm_area_struct; I think Some email programs will remove a single blank space at the start of a line. Patch needs these blank spaces. Thanks, Scott Brumbaugh |