On Wed, Jan 04, 2006 at 06:40:33PM -0800, Linus Torvalds wrote:
>
>
> 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.
The end result looks sane, thanks for fixing it up.
But it looks like you forgot to pull from my "remove devfs" git tree at:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/devfs-2.6.git/
so you still are missing some patches :)
thanks,
greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
