lkml.org 
[lkml]   [2006]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PATCH] Driver Core patches for 2.6.15


On Wed, 4 Jan 2006, Greg KH wrote:
> >
> > I can do the trivial manual fixup, but when I do, I have two copies of
> > "usb_match_id()": one in drivers/usb/core/driver.c and one in
> > drivers/usb/core/usb.c.
> >
> > I've pushed out my tree, so that you can see for yourself (it seems to
> > have mirrored out too).
>
> Yeah, I was wondering how that would merge together, I'll take a look at
> the tree after dinner and fix up the problem (there should only be one
> copy of that function.)

Actually, looking closer, my first trivial merge was wrong (it took the
code from both branches), and doing it right seems to get the proper
results (with just one usb_match_id() function).

I'll push out my _proper_ trivial merge fixup, please just verify that the
end result looks sane and matches what you have.

Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2009-11-18 23:46    [W:0.047 / U:3.536 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site