On 10/27/07, Bruce Dubbs <[EMAIL PROTECTED]> wrote: > Bruce Dubbs wrote: > > Bryan Kadzban wrote: > > > >> where Kay is saying usb_id needs to be fixed, and this udev git commit: > >> > >> http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=963033472f8d2aab0bf77147b916de8f3b0b5450 > > > > I tried to patch udev116 with this and it didn't work. I did a > > cut/paste of the patch to a file, but only the first segment applied. > > The other three rejected. > > > > Is there something different about this patch format? I can generate > > the patch without too much problem, but I wonder why the cut/paste > > doesn't work. > > Never mind. In the git generated file are constructs like: > > @@ -224,8 +222,6 @@ static int usb_id(const char *devpath) > > It should just be: > > @@ -224,8 +222,6 @@ > > The annotation with the function name on the line seems to confuse patch.
I always use diff -p and I've never had this be a problem with patch-2.5.4. It's also the default patch mode of git, and some very large projects distribute patches all over the place in this form. So, it definitely should work. -- Dan -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
