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).
Linus
-
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]
