On 10/28/07, Bruce Dubbs <[EMAIL PROTECTED]> wrote: > Dan Nicholson wrote: > > > 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. > > Hmm. OK. I must have done something wrong. I'm attaching the patch I > made. The last three portions don't apply. Can you see why? > > -- Bruce > > --- a/extras/usb_id/usb_id.c > +++ b/extras/usb_id/usb_id.c > @@ -1,7 +1,5 @@ > /* > - * usb_id.c > - * > - * Identify an USB (block) device > + * usb_id - identify an USB device > * > * Copyright (c) 2005 SUSE Linux Products GmbH, Germany > * > @@ -224,8 +222,6 @@ static int usb_id(const char *devpath)
Can't say I do know why, but the first @@ marker ends without a trailing space, which seems a little strange from the other markers. Anyway, did you try the "raw" format link Bryan sent you? http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff_plain;h=963033472f8d2aab0bf77147b916de8f3b0b5450 -- Dan -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
