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

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

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

I've pushed out my tree, so that you can see for yourself (it seems to
have mirrored out too).

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

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