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, Jan 04, 2006 at 05:38:05PM -0800, Linus Torvalds wrote:
    >
    >
    > On Wed, 4 Jan 2006, Greg KH wrote:
    > >
    > > Here are a lot of driver core patches for 2.6.15. They have all been in
    > > the past few -mm releases with no problems.
    >
    > Strange, because it doesn't merge with your other own changes. It might be
    > an ordering thing (ie they might have merged fine in another order). Or
    > maybe it's just because the -mm scripts will force-apply patches (or drop
    > them).
    >
    > Anyway, there were clashes in drivers/usb/core/usb.c with the patch "USB:
    > fix usb_find_interface for ppc64" that came through your USB changes, and
    > that gets a merge error with the uevent/hotplug thing.
    >
    > 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.)

    thanks,

    greg k-h
    -
    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: 2006-01-05 03:10    [W:0.021 / U:31.588 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site